History

avcodec/speexdec: fix setting frame_size from extradata

Finishes fixing vp5/potter512-400-partial.avi The fate-matroska-ms-mode test ref is updated to reflect that the Speex decoder can now read the stream.

James Almer committed 2 years ago

Commit ab39cc31 parent cad35f02 files · +2 −4Browse files

Unified · Split

2 files
  1. libavcodec/speexdec.c +1 −3
  2. tests/ref/fate/matroska-ms-mode +1 −1
libavcodec/speexdec.c+1−3
@@ -1420,9 +1420,7 @@ static int parse_speex_extradata(AVCodecContext *avctx, · 1419 unmodified lines
1420 if (s->nb_channels <= 0 || s->nb_channels > 2)1420 if (s->nb_channels <= 0 || s->nb_channels > 2)
1421 return AVERROR_INVALIDDATA;1421 return AVERROR_INVALIDDATA;
1422 s->bitrate = bytestream_get_le32(&buf);1422 s->bitrate = bytestream_get_le32(&buf);
1423 s->frame_size = bytestream_get_le32(&buf);1423 s->frame_size = (1 + (s->mode > 0)) * bytestream_get_le32(&buf);
1424 if (s->frame_size < NB_FRAME_SIZE << s->mode)
1425 return AVERROR_INVALIDDATA;
1426 s->vbr = bytestream_get_le32(&buf);1424 s->vbr = bytestream_get_le32(&buf);
1427 s->frames_per_packet = bytestream_get_le32(&buf);1425 s->frames_per_packet = bytestream_get_le32(&buf);
1428 if (s->frames_per_packet <= 0 ||1426 if (s->frames_per_packet <= 0 ||
tests/ref/fate/matroska-ms-mode+1−1
@@ -1,4 +1,4 @@
1a2897e3951b0054d0fa31fe51860444f *tests/data/fate/matroska-ms-mode.matroska1e7f44cd6a5c0f45fea11874afb8c1c0d *tests/data/fate/matroska-ms-mode.matroska
2413103 tests/data/fate/matroska-ms-mode.matroska2413103 tests/data/fate/matroska-ms-mode.matroska
3#extradata 0: 40, 0x54290c933#extradata 0: 40, 0x54290c93
4#extradata 1: 114, 0xb6c807714#extradata 1: 114, 0xb6c80771

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t