Announced in 2e8b0446c6798947dac77fee4a06f9c4e8131ab5. Two FATE-tests needed to be updated because the checksums of side data containing an AVCPBProperties struct changed. buffer_size has also been switched to 64bits because it is a bitsize.
Unified · Split
| @@ -455,35 +455,23 @@ typedef struct AVCPBProperties { · 454 unmodified lines | |||
| 455 | * Maximum bitrate of the stream, in bits per second. | 455 | * Maximum bitrate of the stream, in bits per second. |
| 456 | * Zero if unknown or unspecified. | 456 | * Zero if unknown or unspecified. |
| 457 | */ | 457 | */ |
| 458 | #if FF_API_UNSANITIZED_BITRATES | ||
| 459 | int max_bitrate; | ||
| 460 | #else | ||
| 461 | int64_t max_bitrate; | 458 | int64_t max_bitrate; |
| 462 | #endif | ||
| 463 | /** | 459 | /** |
| 464 | * Minimum bitrate of the stream, in bits per second. | 460 | * Minimum bitrate of the stream, in bits per second. |
| 465 | * Zero if unknown or unspecified. | 461 | * Zero if unknown or unspecified. |
| 466 | */ | 462 | */ |
| 467 | #if FF_API_UNSANITIZED_BITRATES | ||
| 468 | int min_bitrate; | ||
| 469 | #else | ||
| 470 | int64_t min_bitrate; | 463 | int64_t min_bitrate; |
| 471 | #endif | ||
| 472 | /** | 464 | /** |
| 473 | * Average bitrate of the stream, in bits per second. | 465 | * Average bitrate of the stream, in bits per second. |
| 474 | * Zero if unknown or unspecified. | 466 | * Zero if unknown or unspecified. |
| 475 | */ | 467 | */ |
| 476 | #if FF_API_UNSANITIZED_BITRATES | ||
| 477 | int avg_bitrate; | ||
| 478 | #else | ||
| 479 | int64_t avg_bitrate; | 468 | int64_t avg_bitrate; |
| 480 | #endif | ||
| 481 | 469 | ||
| 482 | /** | 470 | /** |
| 483 | * The size of the buffer to which the ratecontrol is applied, in bits. | 471 | * The size of the buffer to which the ratecontrol is applied, in bits. |
| 484 | * Zero if unknown or unspecified. | 472 | * Zero if unknown or unspecified. |
| 485 | */ | 473 | */ |
| 486 | int buffer_size; | 474 | int64_t buffer_size; |
| 487 | 475 | ||
| 488 | /** | 476 | /** |
| 489 | * The delay between the time the packet this structure is associated with | 477 | * The delay between the time the packet this structure is associated with |
| @@ -54,9 +54,6 @@ · 53 unmodified lines | |||
| 54 | #ifndef FF_API_CODED_FRAME | 54 | #ifndef FF_API_CODED_FRAME |
| 55 | #define FF_API_CODED_FRAME (LIBAVCODEC_VERSION_MAJOR < 59) | 55 | #define FF_API_CODED_FRAME (LIBAVCODEC_VERSION_MAJOR < 59) |
| 56 | #endif | 56 | #endif |
| 57 | #ifndef FF_API_UNSANITIZED_BITRATES | ||
| 58 | #define FF_API_UNSANITIZED_BITRATES (LIBAVCODEC_VERSION_MAJOR < 59) | ||
| 59 | #endif | ||
| 60 | #ifndef FF_API_OPENH264_SLICE_MODE | 57 | #ifndef FF_API_OPENH264_SLICE_MODE |
| 61 | #define FF_API_OPENH264_SLICE_MODE (LIBAVCODEC_VERSION_MAJOR < 59) | 58 | #define FF_API_OPENH264_SLICE_MODE (LIBAVCODEC_VERSION_MAJOR < 59) |
| 62 | #endif | 59 | #endif |
| @@ -322,11 +322,7 @@ static void dump_cpb(void *ctx, const AVPacketSideData *sd) · 321 unmodified lines | |||
| 322 | } | 322 | } |
| 323 | 323 | ||
| 324 | av_log(ctx, AV_LOG_INFO, | 324 | av_log(ctx, AV_LOG_INFO, |
| 325 | #if FF_API_UNSANITIZED_BITRATES | 325 | "bitrate max/min/avg: %"PRId64"/%"PRId64"/%"PRId64" buffer size: %"PRId64" ", |
| 326 | "bitrate max/min/avg: %d/%d/%d buffer size: %d ", | ||
| 327 | #else | ||
| 328 | "bitrate max/min/avg: %"PRId64"/%"PRId64"/%"PRId64" buffer size: %d ", | ||
| 329 | #endif | ||
| 330 | cpb->max_bitrate, cpb->min_bitrate, cpb->avg_bitrate, | 326 | cpb->max_bitrate, cpb->min_bitrate, cpb->avg_bitrate, |
| 331 | cpb->buffer_size); | 327 | cpb->buffer_size); |
| 332 | if (cpb->vbv_delay == UINT64_MAX) | 328 | if (cpb->vbv_delay == UINT64_MAX) |
| @@ -6,7 +6,7 @@ · 5 unmodified lines | |||
| 6 | #codec_id 0: mpeg2video | 6 | #codec_id 0: mpeg2video |
| 7 | #dimensions 0: 1280x720 | 7 | #dimensions 0: 1280x720 |
| 8 | #sar 0: 3/4 | 8 | #sar 0: 3/4 |
| 9 | 0, -1, 0, 1, 150000, 0x0547870d, S=1, 24, 0x5aa90ad0 | 9 | 0, -1, 0, 1, 150000, 0x0547870d, S=1, 40, 0x7ea50ad0 |
| 10 | 0, 0, 1, 1, 150000, 0xe80a1612, F=0x0 | 10 | 0, 0, 1, 1, 150000, 0xe80a1612, F=0x0 |
| 11 | 0, 1, 2, 1, 150000, 0xc5c50e2f, F=0x0 | 11 | 0, 1, 2, 1, 150000, 0xc5c50e2f, F=0x0 |
| 12 | 0, 2, 3, 1, 150000, 0x51e28a04, F=0x0 | 12 | 0, 2, 3, 1, 150000, 0x51e28a04, F=0x0 |
| @@ -15,7 +15,7 @@ · 14 unmodified lines | |||
| 15 | 1, 5760, 5760, 2880, 1536, 0xbab5129c | 15 | 1, 5760, 5760, 2880, 1536, 0xbab5129c |
| 16 | 1, 8640, 8640, 2880, 1536, 0x602f034b, S=1, 1, 0x00bd00bd | 16 | 1, 8640, 8640, 2880, 1536, 0x602f034b, S=1, 1, 0x00bd00bd |
| 17 | 1, 11520, 11520, 2880, 906, 0x69cdcbcd | 17 | 1, 11520, 11520, 2880, 906, 0x69cdcbcd |
| 18 | 0, 32037, 36541, 1501, 114336, 0x37a215a8, S=2, 1, 0x00e000e0, 24, 0x663d0b52 | 18 | 0, 32037, 36541, 1501, 114336, 0x37a215a8, S=2, 1, 0x00e000e0, 40, 0x91e10b52 |
| 19 | 0, 33538, 33538, 1501, 12560, 0xb559a3d4, F=0x0, S=1, 1, 0x00e000e0 | 19 | 0, 33538, 33538, 1501, 12560, 0xb559a3d4, F=0x0, S=1, 1, 0x00e000e0 |
| 20 | 0, 35040, 35040, 1501, 12704, 0x2614adf4, F=0x0, S=1, 1, 0x00e000e0 | 20 | 0, 35040, 35040, 1501, 12704, 0x2614adf4, F=0x0, S=1, 1, 0x00e000e0 |
| 21 | 0, 36541, 41046, 1501, 51976, 0x9ff1dbfe, F=0x0, S=1, 1, 0x00e000e0 | 21 | 0, 36541, 41046, 1501, 51976, 0x9ff1dbfe, F=0x0, S=1, 1, 0x00e000e0 |