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

fftools/ffmpeg_enc: do not round frame durations prematurely

Browse Source 
Changes the results of fate-idroq-video-encode and fate-lavf* tests,
where different frames now get duplicated by framerate conversion code.
pull/390/head
Anton Khirnov 1 year ago
parent 303f10d4dd
commit 9d4ca76c08
9 changed files with 23 additions and 23 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. 6
      fftools/ffmpeg_enc.c
  2. 2
      tests/ref/fate/idroq-video-encode
  3. 4
      tests/ref/lavf/dv_ntsc
  4. 6
      tests/ref/lavf/gxf_ntsc
  5. 6
      tests/ref/lavf/ismv
  6. 6
      tests/ref/lavf/mov
  7. 6
      tests/ref/lavf/mp4
  8. 4
      tests/ref/lavf/mpg
  9. 6
      tests/ref/lavf/mxf

6
fftools/ffmpeg_enc.c
Unescape View File

@ -1030,11 +1030,11 @@ static void video_sync_process(OutputFile *of, OutputStream *ost,
*nb_frames = 0;
else if (delta > 0.6)
e->next_pts = llrint(sync_ipts);
frame->duration = duration;
frame->duration = llrint(duration);
break;
case VSYNC_DROP:
case VSYNC_PASSTHROUGH:
frame->duration = duration;
frame->duration = llrint(duration);
e->next_pts = llrint(sync_ipts);
break;
default:
@ -1112,7 +1112,7 @@ static int do_video_out(OutputFile *of, OutputStream *ost, AVFrame *frame)
if (frame) {
FrameData *fd = frame_data(frame);
duration = lrintf(frame->duration * av_q2d(frame->time_base) / av_q2d(enc->time_base));
duration = frame->duration * av_q2d(frame->time_base) / av_q2d(enc->time_base);
if (duration <= 0 &&
fd->frame_rate_filter.num > 0 && fd->frame_rate_filter.den > 0)

2
tests/ref/fate/idroq-video-encode
Unescape View File

@ -1 +1 @@
e9ff61023826fce304350ff6e7c63b2f
6d8303bb56b8da2a63efef323aea235e

4
tests/ref/lavf/dv_ntsc
Unescape View File

@ -1,3 +1,3 @@
5569626370c7c72d40de2c4559e32856 *tests/data/lavf/lavf.dv_ntsc
d28a4c67aa8e3413458de9ca7e6f00ed *tests/data/lavf/lavf.dv_ntsc
3480000 tests/data/lavf/lavf.dv_ntsc
tests/data/lavf/lavf.dv_ntsc CRC=0xa0088163
tests/data/lavf/lavf.dv_ntsc CRC=0xaa69ba6a

6
tests/ref/lavf/gxf_ntsc
Unescape View File

@ -1,3 +1,3 @@
9a27673c85f1671ba9ff7cd33e5735de *tests/data/lavf/lavf.gxf_ntsc
794660 tests/data/lavf/lavf.gxf_ntsc
tests/data/lavf/lavf.gxf_ntsc CRC=0xdcd39443
5071abe1fd46a3ca3d669203c6d45883 *tests/data/lavf/lavf.gxf_ntsc
793900 tests/data/lavf/lavf.gxf_ntsc
tests/data/lavf/lavf.gxf_ntsc CRC=0xb73f184e

6
tests/ref/lavf/ismv
Unescape View File

@ -1,9 +1,9 @@
48fb8d7a5d19bd60f3a49ccf4b7d6593 *tests/data/lavf/lavf.ismv
313169 tests/data/lavf/lavf.ismv
tests/data/lavf/lavf.ismv CRC=0x9d9a638a
d19cd8e310a2e94fe0a0d11c5dc29217 *tests/data/lavf/lavf.ismv
322075 tests/data/lavf/lavf.ismv
tests/data/lavf/lavf.ismv CRC=0xe8130120
b3ba38e148c00466441627ea04749f63 *tests/data/lavf/lavf.ismv
322247 tests/data/lavf/lavf.ismv
tests/data/lavf/lavf.ismv CRC=0xc5569484
3b6023766845b51b075aed474c00f73c *tests/data/lavf/lavf.ismv
312546 tests/data/lavf/lavf.ismv
tests/data/lavf/lavf.ismv CRC=0x9d9a638a

6
tests/ref/lavf/mov
Unescape View File

@ -1,9 +1,9 @@
11bd76730274924e02623172b82b5236 *tests/data/lavf/lavf.mov
357539 tests/data/lavf/lavf.mov
tests/data/lavf/lavf.mov CRC=0xbb2b949b
6efa586655e3db043cb29668f5216610 *tests/data/lavf/lavf.mov
366621 tests/data/lavf/lavf.mov
tests/data/lavf/lavf.mov CRC=0xa9793231
9ed9ce9b636f85b62d3c3583ff84691e *tests/data/lavf/lavf.mov
366793 tests/data/lavf/lavf.mov
tests/data/lavf/lavf.mov CRC=0xc75fc595
c80c625ded376602e71d5aa6ac6fdb1c *tests/data/lavf/lavf.mov
356921 tests/data/lavf/lavf.mov
tests/data/lavf/lavf.mov CRC=0xbb2b949b

6
tests/ref/lavf/mp4
Unescape View File

@ -1,9 +1,9 @@
a6e44724cab1c4b50c49b0fd227b87d3 *tests/data/lavf/lavf.mp4
312477 tests/data/lavf/lavf.mp4
tests/data/lavf/lavf.mp4 CRC=0x9d9a638a
19cbdb02f2f3e35bae779e2323be1b8e *tests/data/lavf/lavf.mp4
321363 tests/data/lavf/lavf.mp4
tests/data/lavf/lavf.mp4 CRC=0xe8130120
0906d4bcb61dd8bcb21a37d6b5b48ea2 *tests/data/lavf/lavf.mp4
321535 tests/data/lavf/lavf.mp4
tests/data/lavf/lavf.mp4 CRC=0xc5569484
8ab9dd09f02b6d8146a40fc3c918d979 *tests/data/lavf/lavf.mp4
312021 tests/data/lavf/lavf.mp4
tests/data/lavf/lavf.mp4 CRC=0x9d9a638a

4
tests/ref/lavf/mpg
Unescape View File

@ -1,9 +1,9 @@
01bbdea588da51ab4a9d1d26f3443c96 *tests/data/lavf/lavf.mpg
372736 tests/data/lavf/lavf.mpg
tests/data/lavf/lavf.mpg CRC=0x000e23ae
87b447b78a7d1141b9d41bb3aa50434d *tests/data/lavf/lavf.mpg
67a87970fae5cbd878ad6353aa9138da *tests/data/lavf/lavf.mpg
389120 tests/data/lavf/lavf.mpg
tests/data/lavf/lavf.mpg CRC=0x60ba4ab9
tests/data/lavf/lavf.mpg CRC=0x9264985a
284f41c914df75c12de01e223d65f87f *tests/data/lavf/lavf.mpg
372736 tests/data/lavf/lavf.mpg
tests/data/lavf/lavf.mpg CRC=0x000e23ae

6
tests/ref/lavf/mxf
Unescape View File

@ -1,9 +1,9 @@
9ec1ad83b3400de11ca2f70b3b2d4c4d *tests/data/lavf/lavf.mxf
526393 tests/data/lavf/lavf.mxf
tests/data/lavf/lavf.mxf CRC=0x8dddfaab
546eb8c864c0d76c6a9d5303701e9031 *tests/data/lavf/lavf.mxf
561721 tests/data/lavf/lavf.mxf
tests/data/lavf/lavf.mxf CRC=0x96ff1b48
3edfabe839a29f5902969c15ebac6d8d *tests/data/lavf/lavf.mxf
551481 tests/data/lavf/lavf.mxf
tests/data/lavf/lavf.mxf CRC=0xf091e687
5bd0ce691510e6fae969886c32ad7a14 *tests/data/lavf/lavf.mxf
526393 tests/data/lavf/lavf.mxf
tests/data/lavf/lavf.mxf CRC=0x8dddfaab

Write Preview
Loading…
Cancel
Save