Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

mpegaudio_parser: do not ignore information from the first parsed frame

Browse Source 
Update some demuxing and seeking fate tests.
pull/3/merge
Justin Ruggles 13 years ago
parent 6776a8f189
commit 0b8b7db01b
4 changed files with 15 additions and 19 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      libavcodec/mpegaudio_parser.c
  2. 6
      tests/ref/fate/pva-demux
  3. 12
      tests/ref/fate/wtv-demux
  4. 14
      tests/ref/seek/mp2_mp2

2
libavcodec/mpegaudio_parser.c
Unescape View File

@ -75,7 +75,7 @@ static int mpegaudio_parse(AVCodecParserContext *s1,
s->header_count++;
s->frame_size = ret-4;
if(s->header_count > 1){
if (s->header_count > 0) {
avctx->sample_rate= sr;
avctx->channels = channels;
s1->duration = frame_size;

6
tests/ref/fate/pva-demux
Unescape View File

@ -1,8 +1,8 @@
#tb 0: 1/90000
0, 0, 0, 2160, 384, 0x071abcc8
0, 0, 0, 2160, 384, 0x31c9aee0
0, 2160, 2160, 2160, 384, 0xa50eaa94
0, 4320, 4320, 2160, 384, 0x9e86ba0e
0, 2160, 2160, 2160, 384, 0x31c9aee0
0, 4320, 4320, 2160, 384, 0xa50eaa94
0, 6480, 6480, 2160, 384, 0x9e86ba0e
0, 8640, 8640, 2160, 384, 0x2321b800
0, 10800, 10800, 2160, 384, 0x2347afa8
0, 12960, 12960, 2160, 384, 0x0831b8d3

12
tests/ref/fate/wtv-demux
Unescape View File

@ -1,11 +1,11 @@
#tb 0: 1/10000000
#tb 1: 1/10000000
1, -2, -2, 180000, 576, 0x9b6e1638
1, 179998, 179998, 240000, 576, 0x0ca91183
1, 419998, 419998, 240000, 576, 0xec6a180f
1, 659998, 659998, 240000, 576, 0x478a2b9b
1, 899998, 899998, 240000, 576, 0x00fa15b3
1, 1139998, 1139998, 240000, 576, 0xfb551816
1, -2, -2, 240000, 576, 0x9b6e1638
1, 239998, 239998, 240000, 576, 0x0ca91183
1, 479998, 479998, 240000, 576, 0xec6a180f
1, 719998, 719998, 240000, 576, 0x478a2b9b
1, 959998, 959998, 240000, 576, 0x00fa15b3
1, 1199998, 1199998, 240000, 576, 0xfb551816
1, 1439998, 1439998, 240000, 576, 0x422e12bd
1, 1679998, 1679998, 240000, 576, 0xa7581b29
1, 1919998, 1919998, 240000, 576, 0xd4b31a74

14
tests/ref/seek/mp2_mp2
Unescape View File

@ -1,20 +1,18 @@
ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 0 size: 417
ret: 0 st:-1 flags:0 ts:-1.000000
ret: 0 st: 0 flags:1 dts: 0.026122 pts: 0.026122 pos: 417 size: 418
ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 0 size: 417
ret: 0 st:-1 flags:1 ts: 1.894167
ret: 0 st: 0 flags:1 dts: 1.880816 pts: 1.880816 pos: 30093 size: 418
ret: 0 st: 0 flags:0 ts: 0.788334
ret: 0 st: 0 flags:1 dts: 0.809796 pts: 0.809796 pos: 12956 size: 418
ret: 0 st: 0 flags:1 ts:-0.317499
ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 0 size: 417
ret:-1 st: 0 flags:1 ts:-0.317499
ret: 0 st:-1 flags:0 ts: 2.576668
ret: 0 st: 0 flags:1 dts: 2.586122 pts: 2.586122 pos: 41377 size: 418
ret: 0 st:-1 flags:1 ts: 1.470835
ret: 0 st: 0 flags:1 dts: 1.462857 pts: 1.462857 pos: 23405 size: 418
ret: 0 st: 0 flags:0 ts: 0.365002
ret: 0 st: 0 flags:1 dts: 0.365714 pts: 0.365714 pos: 5851 size: 418
ret: 0 st: 0 flags:1 ts:-0.740831
ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 0 size: 417
ret:-1 st: 0 flags:1 ts:-0.740831
ret: 0 st:-1 flags:0 ts: 2.153336
ret: 0 st: 0 flags:1 dts: 2.168163 pts: 2.168163 pos: 34690 size: 418
ret: 0 st:-1 flags:1 ts: 1.047503
@ -41,13 +39,11 @@ ret: 0 st: 0 flags:1 ts: 1.989173
ret: 0 st: 0 flags:1 dts: 1.985306 pts: 1.985306 pos: 31764 size: 418
ret: 0 st:-1 flags:0 ts: 0.883340
ret: 0 st: 0 flags:1 dts: 0.888163 pts: 0.888163 pos: 14210 size: 418
ret: 0 st:-1 flags:1 ts:-0.222493
ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 0 size: 417
ret:-1 st:-1 flags:1 ts:-0.222493
ret: 0 st: 0 flags:0 ts: 2.671674
ret: 0 st: 0 flags:1 dts: 2.690612 pts: 2.690612 pos: 43049 size: 418
ret: 0 st: 0 flags:1 ts: 1.565841
ret: 0 st: 0 flags:1 dts: 1.541224 pts: 1.541224 pos: 24659 size: 418
ret: 0 st:-1 flags:0 ts: 0.460008
ret: 0 st: 0 flags:1 dts: 0.470204 pts: 0.470204 pos: 7523 size: 418
ret: 0 st:-1 flags:1 ts:-0.645825
ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 0 size: 417
ret:-1 st:-1 flags:1 ts:-0.645825

Write Preview
Loading…
Cancel
Save