Unified · Split
| @@ -15,6 +15,7 @@ version <next>: · 14 unmodified lines | |||
| 15 | - adecorrelate audio filter | 15 | - adecorrelate audio filter |
| 16 | - atilt audio filter | 16 | - atilt audio filter |
| 17 | - grayworld video filter | 17 | - grayworld video filter |
| 18 | - AV1 Low overhead bitstream format muxer | ||
| 18 | 19 | ||
| 19 | 20 | ||
| 20 | version 4.4: | 21 | version 4.4: |
| @@ -3388,6 +3388,7 @@ mxf_opatom_muxer_select="mxf_muxer" · 3387 unmodified lines | |||
| 3388 | nut_muxer_select="riffenc" | 3388 | nut_muxer_select="riffenc" |
| 3389 | nuv_demuxer_select="riffdec" | 3389 | nuv_demuxer_select="riffdec" |
| 3390 | obu_demuxer_select="av1_frame_merge_bsf av1_parser" | 3390 | obu_demuxer_select="av1_frame_merge_bsf av1_parser" |
| 3391 | obu_muxer_select="av1_metadata_bsf" | ||
| 3391 | oga_muxer_select="ogg_muxer" | 3392 | oga_muxer_select="ogg_muxer" |
| 3392 | ogg_demuxer_select="dirac_parse" | 3393 | ogg_demuxer_select="dirac_parse" |
| 3393 | ogv_muxer_select="ogg_muxer" | 3394 | ogv_muxer_select="ogg_muxer" |
| @@ -599,6 +599,7 @@ library: · 598 unmodified lines | |||
| 599 | @item raw NULL @tab X @tab | 599 | @item raw NULL @tab X @tab |
| 600 | @item raw video @tab X @tab X | 600 | @item raw video @tab X @tab X |
| 601 | @item raw id RoQ @tab X @tab | 601 | @item raw id RoQ @tab X @tab |
| 602 | @item raw OBU @tab X @tab X | ||
| 602 | @item raw SBC @tab X @tab X | 603 | @item raw SBC @tab X @tab X |
| 603 | @item raw Shorten @tab @tab X | 604 | @item raw Shorten @tab @tab X |
| 604 | @item raw TAK @tab @tab X | 605 | @item raw TAK @tab @tab X |
| @@ -379,6 +379,7 @@ OBJS-$(CONFIG_NUT_MUXER) += nutenc.o nut.o · 378 unmodified lines | |||
| 379 | OBJS-$(CONFIG_NUV_DEMUXER) += nuv.o | 379 | OBJS-$(CONFIG_NUV_DEMUXER) += nuv.o |
| 380 | OBJS-$(CONFIG_AV1_DEMUXER) += av1dec.o | 380 | OBJS-$(CONFIG_AV1_DEMUXER) += av1dec.o |
| 381 | OBJS-$(CONFIG_OBU_DEMUXER) += av1dec.o | 381 | OBJS-$(CONFIG_OBU_DEMUXER) += av1dec.o |
| 382 | OBJS-$(CONFIG_OBU_MUXER) += rawenc.o | ||
| 382 | OBJS-$(CONFIG_OGG_DEMUXER) += oggdec.o \ | 383 | OBJS-$(CONFIG_OGG_DEMUXER) += oggdec.o \ |
| 383 | oggparsecelt.o \ | 384 | oggparsecelt.o \ |
| 384 | oggparsedirac.o \ | 385 | oggparsedirac.o \ |
| @@ -305,6 +305,7 @@ extern const AVInputFormat ff_nut_demuxer; · 304 unmodified lines | |||
| 305 | extern const AVOutputFormat ff_nut_muxer; | 305 | extern const AVOutputFormat ff_nut_muxer; |
| 306 | extern const AVInputFormat ff_nuv_demuxer; | 306 | extern const AVInputFormat ff_nuv_demuxer; |
| 307 | extern const AVInputFormat ff_obu_demuxer; | 307 | extern const AVInputFormat ff_obu_demuxer; |
| 308 | extern const AVOutputFormat ff_obu_muxer; | ||
| 308 | extern const AVOutputFormat ff_oga_muxer; | 309 | extern const AVOutputFormat ff_oga_muxer; |
| 309 | extern const AVInputFormat ff_ogg_demuxer; | 310 | extern const AVInputFormat ff_ogg_demuxer; |
| 310 | extern const AVOutputFormat ff_ogg_muxer; | 311 | extern const AVOutputFormat ff_ogg_muxer; |
| @@ -453,6 +453,26 @@ const AVOutputFormat ff_mpeg2video_muxer = { · 452 unmodified lines | |||
| 453 | }; | 453 | }; |
| 454 | #endif | 454 | #endif |
| 455 | 455 | ||
| 456 | #if CONFIG_OBU_MUXER | ||
| 457 | static int obu_check_bitstream(struct AVFormatContext *s, const AVPacket *pkt) | ||
| 458 | { | ||
| 459 | AVStream *st = s->streams[0]; | ||
| 460 | return ff_stream_add_bitstream_filter(st, "av1_metadata", "td=insert"); | ||
| 461 | } | ||
| 462 | |||
| 463 | const AVOutputFormat ff_obu_muxer = { | ||
| 464 | .name = "obu", | ||
| 465 | .long_name = NULL_IF_CONFIG_SMALL("AV1 low overhead OBU"), | ||
| 466 | .extensions = "obu", | ||
| 467 | .audio_codec = AV_CODEC_ID_NONE, | ||
| 468 | .video_codec = AV_CODEC_ID_AV1, | ||
| 469 | .init = force_one_stream, | ||
| 470 | .write_packet = ff_raw_write_packet, | ||
| 471 | .check_bitstream = obu_check_bitstream, | ||
| 472 | .flags = AVFMT_NOTIMESTAMPS, | ||
| 473 | }; | ||
| 474 | #endif | ||
| 475 | |||
| 456 | #if CONFIG_RAWVIDEO_MUXER | 476 | #if CONFIG_RAWVIDEO_MUXER |
| 457 | const AVOutputFormat ff_rawvideo_muxer = { | 477 | const AVOutputFormat ff_rawvideo_muxer = { |
| 458 | .name = "rawvideo", | 478 | .name = "rawvideo", |
| @@ -32,8 +32,8 @@ · 31 unmodified lines | |||
| 32 | // Major bumping may affect Ticket5467, 5421, 5451(compatibility with Chromium) | 32 | // Major bumping may affect Ticket5467, 5421, 5451(compatibility with Chromium) |
| 33 | // Also please add any ticket numbers that you believe might be affected here | 33 | // Also please add any ticket numbers that you believe might be affected here |
| 34 | #define LIBAVFORMAT_VERSION_MAJOR 59 | 34 | #define LIBAVFORMAT_VERSION_MAJOR 59 |
| 35 | #define LIBAVFORMAT_VERSION_MINOR 4 | 35 | #define LIBAVFORMAT_VERSION_MINOR 5 |
| 36 | #define LIBAVFORMAT_VERSION_MICRO 102 | 36 | #define LIBAVFORMAT_VERSION_MICRO 100 |
| 37 | 37 | ||
| 38 | #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ | 38 | #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ |
| 39 | LIBAVFORMAT_VERSION_MINOR, \ | 39 | LIBAVFORMAT_VERSION_MINOR, \ |