From git at videolan.org Tue Jul 1 09:57:12 2025 From: git at videolan.org (=?UTF-8?Q?Peter_Ross?=) Date: Tue, 01 Jul 2025 06:57:12 +0000 Subject: [FFmpeg-cvslog] =?utf-8?q?tools/pktdumper=3A_dump_extradata_buff?= =?utf-8?q?ers?= Message-ID: <20250701065714.0B370412947@natalya.videolan.org> ffmpeg | branch: master | Peter Ross | Sat Oct 15 07:59:50 2022 +1100| [3b9dbda49bb16a7e89fce9bd91108a33c638f8e6] | committer: Peter Ross tools/pktdumper: dump extradata buffers > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3b9dbda49bb16a7e89fce9bd91108a33c638f8e6 --- tools/pktdumper.c | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/tools/pktdumper.c b/tools/pktdumper.c index c51f5c8922..d7d3147b22 100644 --- a/tools/pktdumper.c +++ b/tools/pktdumper.c @@ -37,6 +37,7 @@ #define FILENAME_BUF_SIZE 4096 #define PKTFILESUFF "_%08" PRId64 "_%02d_%010" PRId64 "_%06d_%c.bin" +#define EXTRADATAFILESUFF "_extradata_%02d_%06d.bin" static int usage(int ret) { @@ -52,6 +53,7 @@ static int usage(int ret) int main(int argc, char **argv) { char fntemplate[FILENAME_BUF_SIZE]; + char fntemplate2[FILENAME_BUF_SIZE]; char pktfilename[FILENAME_BUF_SIZE]; AVFormatContext *fctx = NULL; AVPacket *pkt; @@ -86,8 +88,6 @@ int main(int argc, char **argv) fprintf(stderr, "filename too long\n"); return usage(1); } - strcat(fntemplate, PKTFILESUFF); - printf("FNTEMPLATE: '%s'\n", fntemplate); err = avformat_open_input(&fctx, argv[1], NULL, NULL); if (err < 0) { @@ -107,6 +107,30 @@ int main(int argc, char **argv) return 1; } + strcpy(fntemplate2, fntemplate); + strcat(fntemplate2, EXTRADATAFILESUFF); + + for (int i = 0; i < fctx->nb_streams; i++) { + AVCodecParameters * par = fctx->streams[i]->codecpar; + int fd; + if (par->extradata_size) { + snprintf(pktfilename, sizeof(pktfilename), fntemplate2, i, par->extradata_size); + printf(EXTRADATAFILESUFF "\n", i, par->extradata_size); + if (!nowrite) { + fd = open(pktfilename, O_WRONLY | O_CREAT, 0644); + err = write(fd, par->extradata, par->extradata_size); + if (err < 0) { + fprintf(stderr, "write: error %d\n", err); + return 1; + } + close(fd); + } + } + } + + strcat(fntemplate, PKTFILESUFF); + printf("FNTEMPLATE: '%s'\n", fntemplate); + while ((err = av_read_frame(fctx, pkt)) >= 0) { int fd; snprintf(pktfilename, sizeof(pktfilename), fntemplate, pktnum, From git at videolan.org Tue Jul 1 23:52:46 2025 From: git at videolan.org (=?UTF-8?Q?James_Almer?=) Date: Tue, 01 Jul 2025 20:52:46 +0000 Subject: [FFmpeg-cvslog] =?utf-8?q?avutil=3A_add_an_API_to_handle_3D_Refe?= =?utf-8?q?rence_Displays_Information?= Message-ID: <20250701205247.44F354128CD@natalya.videolan.org> ffmpeg | branch: master | James Almer | Fri Jan 31 10:42:19 2025 -0300| [80a05bea4f09ff138b3cc047c452cabb83fcecac] | committer: Timo Rothenpieler avutil: add an API to handle 3D Reference Displays Information As defined in section G.14.3.2.3 of ITU-T H.265, it's required for proper signaling of MV-HEVC. Signed-off-by: James Almer > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=80a05bea4f09ff138b3cc047c452cabb83fcecac --- libavutil/Makefile | 2 + libavutil/tdrdi.c | 51 ++++++++++++++++ libavutil/tdrdi.h | 164 ++++++++++++++++++++++++++++++++++++++++++++++++++++ libavutil/version.h | 2 +- 4 files changed, 218 insertions(+), 1 deletion(-) diff --git a/libavutil/Makefile b/libavutil/Makefile index 9ef118016b..94a56bb72f 100644 --- a/libavutil/Makefile +++ b/libavutil/Makefile @@ -85,6 +85,7 @@ HEADERS = adler32.h \ sha512.h \ spherical.h \ stereo3d.h \ + tdrdi.h \ threadmessage.h \ time.h \ timecode.h \ @@ -179,6 +180,7 @@ OBJS = adler32.o \ slicethread.o \ spherical.o \ stereo3d.o \ + tdrdi.o \ threadmessage.o \ time.o \ timecode.o \ diff --git a/libavutil/tdrdi.c b/libavutil/tdrdi.c new file mode 100644 index 0000000000..26192a1d2f --- /dev/null +++ b/libavutil/tdrdi.c @@ -0,0 +1,51 @@ +/* + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include +#include + +#include "mem.h" +#include "tdrdi.h" + +AV3DReferenceDisplaysInfo *av_tdrdi_alloc(unsigned int nb_displays, size_t *out_size) +{ + struct TestStruct { + AV3DReferenceDisplaysInfo p; + AV3DReferenceDisplay b; + }; + const size_t entries_offset = offsetof(struct TestStruct, b); + size_t size = entries_offset; + AV3DReferenceDisplaysInfo *tdrdi; + + if (nb_displays > (SIZE_MAX - size) / sizeof(AV3DReferenceDisplay)) + return NULL; + size += sizeof(AV3DReferenceDisplay) * nb_displays; + + tdrdi = av_mallocz(size); + if (!tdrdi) + return NULL; + + tdrdi->num_ref_displays = nb_displays; + tdrdi->entry_size = sizeof(AV3DReferenceDisplay); + tdrdi->entries_offset = entries_offset; + + if (out_size) + *out_size = size; + + return tdrdi; +} diff --git a/libavutil/tdrdi.h b/libavutil/tdrdi.h new file mode 100644 index 0000000000..8dcca42c7b --- /dev/null +++ b/libavutil/tdrdi.h @@ -0,0 +1,164 @@ +/* + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +/** + * @file + * @ingroup lavu_video_3d_reference_displays_info + * Spherical video + */ + +#ifndef AVUTIL_TDRDI_H +#define AVUTIL_TDRDI_H + +#include +#include + +#include "libavutil/avassert.h" + +/** + * @defgroup lavu_video_3d_reference_displays_info 3D Reference Displays Information + * @ingroup lavu_video + * + * The 3D Reference Displays Information describes information about the reference display + * width(s) and reference viewing distance(s) as well as information about the corresponding + * reference stereo pair(s). + * @{ + */ + +#define AV_TDRDI_MAX_NUM_REF_DISPLAY 32 + +/** + * This structure describes information about the reference display width(s) and reference + * viewing distance(s) as well as information about the corresponding reference stereo pair(s). + * See section G.14.3.2.3 of ITU-T H.265 for more information. + * + * @note The struct must be allocated with av_tdrdi_alloc() and + * its size is not a part of the public ABI. + */ +typedef struct AV3DReferenceDisplaysInfo { + /** + * The exponent of the maximum allowable truncation error for + * {exponent,mantissa}_ref_display_width as given by 2^{(-prec_ref_display_width)}. + */ + uint8_t prec_ref_display_width; + + /** + * A flag to indicate the presence of reference viewing distance. + * If false, the values of prec_ref_viewing_dist, exponent_ref_viewing_distance, + * and mantissa_ref_viewing_distance are undefined. + */ + uint8_t ref_viewing_distance_flag; + + /** + * The exponent of the maximum allowable truncation error for + * {exponent,mantissa}_ref_viewing_distance as given by 2^{^(-prec_ref_viewing_dist)}. + * The value of prec_ref_viewing_dist shall be in the range of 0 to 31, inclusive. + */ + uint8_t prec_ref_viewing_dist; + + /** + * The number of reference displays that are signalled in this struct. + * Allowed range is 1 to 32, inclusive. + */ + uint8_t num_ref_displays; + + /** + * Offset in bytes from the beginning of this structure at which the array + * of reference displays starts. + */ + size_t entries_offset; + + /** + * Size of each entry in bytes. May not match sizeof(AV3DReferenceDisplay). + */ + size_t entry_size; +} AV3DReferenceDisplaysInfo; + +/** + * Data structure for single deference display information. + * It is allocated as a part of AV3DReferenceDisplaysInfo and should be retrieved with + * av_tdrdi_get_display(). + * + * sizeof(AV3DReferenceDisplay) is not a part of the ABI and new fields may be + * added to it. +*/ +typedef struct AV3DReferenceDisplay { + /** + * The ViewId of the left view of a stereo pair corresponding to the n-th reference display. + */ + uint16_t left_view_id; + + /** + * The ViewId of the left view of a stereo pair corresponding to the n-th reference display. + */ + uint16_t right_view_id; + + /** + * The exponent part of the reference display width of the n-th reference display. + */ + uint8_t exponent_ref_display_width; + + /** + * The mantissa part of the reference display width of the n-th reference display. + */ + uint8_t mantissa_ref_display_width; + + /** + * Tthe exponent part of the reference viewing distance of the n-th reference display. + */ + uint8_t exponent_ref_viewing_distance; + + /** + * The mantissa part of the reference viewing distance of the n-th reference display. + */ + uint8_t mantissa_ref_viewing_distance; + + /** + * An array of flags to indicates that the information about additional horizontal shift of + * the left and right views for the n-th reference display is present. + */ + uint8_t additional_shift_present_flag; + + /** + * The recommended additional horizontal shift for a stereo pair corresponding to the n-th + * reference baseline and the n-th reference display. + */ + int16_t num_sample_shift; +} AV3DReferenceDisplay; + +static av_always_inline AV3DReferenceDisplay* +av_tdrdi_get_display(AV3DReferenceDisplaysInfo *tdrdi, unsigned int idx) +{ + av_assert0(idx < tdrdi->num_ref_displays); + return (AV3DReferenceDisplay *)((uint8_t *)tdrdi + tdrdi->entries_offset + + idx * tdrdi->entry_size); +} + +/** + * Allocate a AV3DReferenceDisplaysInfo structure and initialize its fields to default + * values. + * + * @return the newly allocated struct or NULL on failure + */ +AV3DReferenceDisplaysInfo *av_tdrdi_alloc(unsigned int nb_displays, size_t *size); + +/** + * @} + */ + +#endif /* AVUTIL_TDRDI_H */ diff --git a/libavutil/version.h b/libavutil/version.h index 2979f80233..6e82f039c5 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -79,7 +79,7 @@ */ #define LIBAVUTIL_VERSION_MAJOR 60 -#define LIBAVUTIL_VERSION_MINOR 3 +#define LIBAVUTIL_VERSION_MINOR 4 #define LIBAVUTIL_VERSION_MICRO 100 #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ From git at videolan.org Tue Jul 1 23:52:48 2025 From: git at videolan.org (=?UTF-8?Q?James_Almer?=) Date: Tue, 01 Jul 2025 20:52:48 +0000 Subject: [FFmpeg-cvslog] =?utf-8?q?avutil/frame=3A_add_a_3D_Reference_Dis?= =?utf-8?q?plays_Information_side_data_type?= Message-ID: <20250701205249.5124F4128E2@natalya.videolan.org> ffmpeg | branch: master | James Almer | Fri Jan 31 10:42:54 2025 -0300| [b2e4b0e2826fc8cc84ce0c1eda65a450055da5e3] | committer: Timo Rothenpieler avutil/frame: add a 3D Reference Displays Information side data type Signed-off-by: James Almer > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b2e4b0e2826fc8cc84ce0c1eda65a450055da5e3 --- libavutil/frame.h | 11 +++++++++++ libavutil/side_data.c | 1 + libavutil/version.h | 2 +- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/libavutil/frame.h b/libavutil/frame.h index 8493233ba2..c50cd263d9 100644 --- a/libavutil/frame.h +++ b/libavutil/frame.h @@ -243,6 +243,17 @@ enum AVFrameSideDataType { * The data is an int storing the view ID. */ AV_FRAME_DATA_VIEW_ID, + + /** + * This side data contains information about the reference display width(s) + * and reference viewing distance(s) as well as information about the + * corresponding reference stereo pair(s), i.e., the pair(s) of views to be + * displayed for the viewer's left and right eyes on the reference display + * at the reference viewing distance. + * The payload is the AV3DReferenceDisplaysInfo struct defined in + * libavutil/tdrdi.h. + */ + AV_FRAME_DATA_3D_REFERENCE_DISPLAYS, }; enum AVActiveFormatDescription { diff --git a/libavutil/side_data.c b/libavutil/side_data.c index 17965f2d3c..fa2a2c2a13 100644 --- a/libavutil/side_data.c +++ b/libavutil/side_data.c @@ -55,6 +55,7 @@ static const AVSideDataDescriptor sd_props[] = { [AV_FRAME_DATA_ICC_PROFILE] = { "ICC profile", AV_SIDE_DATA_PROP_GLOBAL | AV_SIDE_DATA_PROP_COLOR_DEPENDENT }, [AV_FRAME_DATA_SEI_UNREGISTERED] = { "H.26[45] User Data Unregistered SEI message", AV_SIDE_DATA_PROP_MULTI }, [AV_FRAME_DATA_VIDEO_HINT] = { "Encoding video hint", AV_SIDE_DATA_PROP_SIZE_DEPENDENT }, + [AV_FRAME_DATA_3D_REFERENCE_DISPLAYS] = { "3D Reference Displays Information", AV_SIDE_DATA_PROP_GLOBAL }, }; const AVSideDataDescriptor *av_frame_side_data_desc(enum AVFrameSideDataType type) diff --git a/libavutil/version.h b/libavutil/version.h index 6e82f039c5..2c0aa3e35e 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -80,7 +80,7 @@ #define LIBAVUTIL_VERSION_MAJOR 60 #define LIBAVUTIL_VERSION_MINOR 4 -#define LIBAVUTIL_VERSION_MICRO 100 +#define LIBAVUTIL_VERSION_MICRO 101 #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ LIBAVUTIL_VERSION_MINOR, \ From git at videolan.org Tue Jul 1 23:52:50 2025 From: git at videolan.org (=?UTF-8?Q?James_Almer?=) Date: Tue, 01 Jul 2025 20:52:50 +0000 Subject: [FFmpeg-cvslog] =?utf-8?q?avcodec/packet=3A_add_a_3D_Reference_D?= =?utf-8?q?isplays_Information_side_data_type?= Message-ID: <20250701205251.5DA504128E5@natalya.videolan.org> ffmpeg | branch: master | James Almer | Fri Jan 31 10:46:27 2025 -0300| [39d5a998bd2c548fc24bf82c04737cdc263affe2] | committer: Timo Rothenpieler avcodec/packet: add a 3D Reference Displays Information side data type Signed-off-by: James Almer > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=39d5a998bd2c548fc24bf82c04737cdc263affe2 --- libavcodec/avcodec.c | 1 + libavcodec/packet.c | 1 + libavcodec/packet.h | 11 +++++++++++ libavcodec/version.h | 2 +- 4 files changed, 14 insertions(+), 1 deletion(-) diff --git a/libavcodec/avcodec.c b/libavcodec/avcodec.c index 7bcb0295e5..03c3d09b87 100644 --- a/libavcodec/avcodec.c +++ b/libavcodec/avcodec.c @@ -65,6 +65,7 @@ const SideDataMap ff_sd_global_map[] = { { AV_PKT_DATA_CONTENT_LIGHT_LEVEL, AV_FRAME_DATA_CONTENT_LIGHT_LEVEL }, { AV_PKT_DATA_ICC_PROFILE, AV_FRAME_DATA_ICC_PROFILE }, { AV_PKT_DATA_AMBIENT_VIEWING_ENVIRONMENT,AV_FRAME_DATA_AMBIENT_VIEWING_ENVIRONMENT }, + { AV_PKT_DATA_3D_REFERENCE_DISPLAYS, AV_FRAME_DATA_3D_REFERENCE_DISPLAYS }, { AV_PKT_DATA_NB }, }; diff --git a/libavcodec/packet.c b/libavcodec/packet.c index 5104eb98b1..4003b56223 100644 --- a/libavcodec/packet.c +++ b/libavcodec/packet.c @@ -308,6 +308,7 @@ const char *av_packet_side_data_name(enum AVPacketSideDataType type) case AV_PKT_DATA_IAMF_RECON_GAIN_INFO_PARAM: return "IAMF Recon Gain Info Parameter Data"; case AV_PKT_DATA_FRAME_CROPPING: return "Frame Cropping"; case AV_PKT_DATA_LCEVC: return "LCEVC NAL data"; + case AV_PKT_DATA_3D_REFERENCE_DISPLAYS: return "3D Reference Displays Info"; } return NULL; } diff --git a/libavcodec/packet.h b/libavcodec/packet.h index 71bc2e0575..a3953776fc 100644 --- a/libavcodec/packet.h +++ b/libavcodec/packet.h @@ -345,6 +345,17 @@ enum AVPacketSideDataType { */ AV_PKT_DATA_LCEVC, + /** + * This side data contains information about the reference display width(s) + * and reference viewing distance(s) as well as information about the + * corresponding reference stereo pair(s), i.e., the pair(s) of views to be + * displayed for the viewer's left and right eyes on the reference display + * at the reference viewing distance. + * The payload is the AV3DReferenceDisplaysInfo struct defined in + * libavutil/tdrdi.h. + */ + AV_PKT_DATA_3D_REFERENCE_DISPLAYS, + /** * The number of side data types. * This is not part of the public API/ABI in the sense that it may diff --git a/libavcodec/version.h b/libavcodec/version.h index 06631ffa8c..789d9047c2 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -30,7 +30,7 @@ #include "version_major.h" #define LIBAVCODEC_VERSION_MINOR 4 -#define LIBAVCODEC_VERSION_MICRO 100 +#define LIBAVCODEC_VERSION_MICRO 101 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ LIBAVCODEC_VERSION_MINOR, \ From git at videolan.org Tue Jul 1 23:52:52 2025 From: git at videolan.org (=?UTF-8?Q?James_Almer?=) Date: Tue, 01 Jul 2025 20:52:52 +0000 Subject: [FFmpeg-cvslog] =?utf-8?q?avformat/dump=3A_add_support_for_3D_Re?= =?utf-8?q?ference_Displays_Information_side_data?= Message-ID: <20250701205253.680414128CD@natalya.videolan.org> ffmpeg | branch: master | James Almer | Fri Jan 31 10:47:12 2025 -0300| [2122f04496e551a55c21fa0721c33eca7d3ddde5] | committer: Timo Rothenpieler avformat/dump: add support for 3D Reference Displays Information side data Signed-off-by: James Almer > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2122f04496e551a55c21fa0721c33eca7d3ddde5 --- libavformat/dump.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/libavformat/dump.c b/libavformat/dump.c index f22b70b660..02f69f9a3a 100644 --- a/libavformat/dump.c +++ b/libavformat/dump.c @@ -37,6 +37,7 @@ #include "libavutil/replaygain.h" #include "libavutil/spherical.h" #include "libavutil/stereo3d.h" +#include "libavutil/tdrdi.h" #include "libavutil/timecode.h" #include "libavcodec/avcodec.h" @@ -461,6 +462,14 @@ static void dump_cropping(void *ctx, const AVPacketSideData *sd) av_log(ctx, AV_LOG_INFO, "%d/%d/%d/%d", left, right, top, bottom); } +static void dump_tdrdi(void *ctx, const AVPacketSideData *sd) +{ + const AV3DReferenceDisplaysInfo *tdrdi = + (const AV3DReferenceDisplaysInfo *)sd->data; + + av_log(ctx, AV_LOG_INFO, "number of reference displays: %u", tdrdi->num_ref_displays); +} + static void dump_sidedata(void *ctx, const AVPacketSideData *side_data, int nb_side_data, int w, int h, AVRational avg_frame_rate, const char *indent, int log_level) @@ -540,6 +549,10 @@ static void dump_sidedata(void *ctx, const AVPacketSideData *side_data, int nb_s av_log(ctx, AV_LOG_INFO, "Frame cropping: "); dump_cropping(ctx, sd); break; + case AV_PKT_DATA_3D_REFERENCE_DISPLAYS: + av_log(ctx, log_level, "3D Reference Displays Information: "); + dump_tdrdi(ctx, sd); + break; default: av_log(ctx, log_level, "unknown side data type %d " "(%"SIZE_SPECIFIER" bytes)", sd->type, sd->size); From git at videolan.org Tue Jul 1 23:52:54 2025 From: git at videolan.org (=?UTF-8?Q?James_Almer?=) Date: Tue, 01 Jul 2025 20:52:54 +0000 Subject: [FFmpeg-cvslog] =?utf-8?q?avfilter/vf=5Fshowinfo=3A_add_support_?= =?utf-8?q?for_3D_Reference_Displays_Information_side_data?= Message-ID: <20250701205255.72D724128E9@natalya.videolan.org> ffmpeg | branch: master | James Almer | Fri Jan 31 10:48:58 2025 -0300| [dbe347f074609acef5b8dba6b9c39f4f5f379e9d] | committer: Timo Rothenpieler avfilter/vf_showinfo: add support for 3D Reference Displays Information side data Signed-off-by: James Almer > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=dbe347f074609acef5b8dba6b9c39f4f5f379e9d --- libavfilter/vf_showinfo.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/libavfilter/vf_showinfo.c b/libavfilter/vf_showinfo.c index 8109ca7fce..c706d00c96 100644 --- a/libavfilter/vf_showinfo.c +++ b/libavfilter/vf_showinfo.c @@ -38,6 +38,7 @@ #include "libavutil/pixdesc.h" #include "libavutil/spherical.h" #include "libavutil/stereo3d.h" +#include "libavutil/tdrdi.h" #include "libavutil/timestamp.h" #include "libavutil/timecode.h" #include "libavutil/mastering_display_metadata.h" @@ -152,6 +153,14 @@ static void dump_roi(AVFilterContext *ctx, const AVFrameSideData *sd) } } +static void dump_tdrdi(AVFilterContext *ctx, const AVFrameSideData *sd) +{ + const AV3DReferenceDisplaysInfo *tdrdi = (const AV3DReferenceDisplaysInfo *)sd->data; + + + av_log(ctx, AV_LOG_INFO, "number of reference displays: %u", tdrdi->num_ref_displays); +} + static void dump_detection_bbox(AVFilterContext *ctx, const AVFrameSideData *sd) { int nb_bboxes; @@ -860,6 +869,9 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *frame) case AV_FRAME_DATA_VIEW_ID: av_log(ctx, AV_LOG_INFO, "view id: %d\n", *(int*)sd->data); break; + case AV_FRAME_DATA_3D_REFERENCE_DISPLAYS: + dump_tdrdi(ctx, sd); + break; default: if (name) av_log(ctx, AV_LOG_INFO, From git at videolan.org Tue Jul 1 23:52:56 2025 From: git at videolan.org (=?UTF-8?Q?James_Almer?=) Date: Tue, 01 Jul 2025 20:52:56 +0000 Subject: [FFmpeg-cvslog] =?utf-8?q?avcodec/hevc/hevcdec=3A_export_3D_Refe?= =?utf-8?q?rence_Displays_side_data?= Message-ID: <20250701205257.819964128ED@natalya.videolan.org> ffmpeg | branch: master | James Almer | Fri Jan 31 10:50:05 2025 -0300| [9c2028b806771543cc8822b0752da601924ca928] | committer: Timo Rothenpieler avcodec/hevc/hevcdec: export 3D Reference Displays side data Signed-off-by: James Almer > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9c2028b806771543cc8822b0752da601924ca928 --- libavcodec/hevc/hevcdec.c | 52 ++++++++++++++++++++++++++++++++++++++++++++++- libavcodec/version.h | 2 +- 2 files changed, 52 insertions(+), 2 deletions(-) diff --git a/libavcodec/hevc/hevcdec.c b/libavcodec/hevc/hevcdec.c index 636df5a4e9..797c9c76c9 100644 --- a/libavcodec/hevc/hevcdec.c +++ b/libavcodec/hevc/hevcdec.c @@ -36,6 +36,7 @@ #include "libavutil/opt.h" #include "libavutil/pixdesc.h" #include "libavutil/stereo3d.h" +#include "libavutil/tdrdi.h" #include "libavutil/timecode.h" #include "aom_film_grain.h" @@ -4099,6 +4100,55 @@ static int hevc_update_thread_context(AVCodecContext *dst, } #endif +static int hevc_sei_to_context(AVCodecContext *avctx, HEVCSEI *sei) +{ + int ret; + + if (sei->tdrdi.num_ref_displays) { + AVBufferRef *buf; + size_t size; + AV3DReferenceDisplaysInfo *tdrdi = av_tdrdi_alloc(sei->tdrdi.num_ref_displays, &size); + + if (!tdrdi) + return AVERROR(ENOMEM); + + buf = av_buffer_create((uint8_t *)tdrdi, size, NULL, NULL, 0); + if (!buf) { + av_free(tdrdi); + return AVERROR(ENOMEM); + } + + tdrdi->prec_ref_display_width = sei->tdrdi.prec_ref_display_width; + tdrdi->ref_viewing_distance_flag = sei->tdrdi.ref_viewing_distance_flag; + tdrdi->prec_ref_viewing_dist = sei->tdrdi.prec_ref_viewing_dist; + tdrdi->num_ref_displays = sei->tdrdi.num_ref_displays; + for (int i = 0; i < sei->tdrdi.num_ref_displays; i++) { + AV3DReferenceDisplay *display = av_tdrdi_get_display(tdrdi, i); + + display->left_view_id = sei->tdrdi.left_view_id[i]; + display->right_view_id = sei->tdrdi.right_view_id[i]; + display->exponent_ref_display_width = sei->tdrdi.exponent_ref_display_width[i]; + display->mantissa_ref_display_width = sei->tdrdi.mantissa_ref_display_width[i]; + display->exponent_ref_viewing_distance = sei->tdrdi.exponent_ref_viewing_distance[i]; + display->mantissa_ref_viewing_distance = sei->tdrdi.mantissa_ref_viewing_distance[i]; + display->additional_shift_present_flag = sei->tdrdi.additional_shift_present_flag[i]; + display->num_sample_shift = sei->tdrdi.num_sample_shift[i]; + } + ret = ff_frame_new_side_data_from_buf_ext(avctx, &avctx->decoded_side_data, &avctx->nb_decoded_side_data, + AV_FRAME_DATA_3D_REFERENCE_DISPLAYS, &buf); + if (ret < 0) { + av_buffer_unref(&buf); + return ret; + } + } + + ret = ff_h2645_sei_to_context(avctx, &sei->common); + if (ret < 0) + return ret; + + return 0; +} + static av_cold int hevc_decode_init(AVCodecContext *avctx) { HEVCContext *s = avctx->priv_data; @@ -4122,7 +4172,7 @@ static av_cold int hevc_decode_init(AVCodecContext *avctx) return ret; } - ret = ff_h2645_sei_to_context(avctx, &s->sei.common); + ret = hevc_sei_to_context(avctx, &s->sei); if (ret < 0) return ret; } diff --git a/libavcodec/version.h b/libavcodec/version.h index 789d9047c2..3187c06855 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -30,7 +30,7 @@ #include "version_major.h" #define LIBAVCODEC_VERSION_MINOR 4 -#define LIBAVCODEC_VERSION_MICRO 101 +#define LIBAVCODEC_VERSION_MICRO 102 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ LIBAVCODEC_VERSION_MINOR, \ From git at videolan.org Tue Jul 1 23:52:58 2025 From: git at videolan.org (=?UTF-8?Q?Diego_de_Souza?=) Date: Tue, 01 Jul 2025 20:52:58 +0000 Subject: [FFmpeg-cvslog] =?utf-8?q?avcodec/nvenc=3A_add_MV-HEVC_encoding_?= =?utf-8?q?support?= Message-ID: <20250701205259.9457B4128BD@natalya.videolan.org> ffmpeg | branch: master | Diego de Souza | Wed Jan 8 15:41:41 2025 +0100| [5083f4ad8e26806b2113d8001dcbf20e220a7309] | committer: Timo Rothenpieler avcodec/nvenc: add MV-HEVC encoding support Added support for MV-HEVC encoding for stereoscopic videos (2 views only). Compatible with the framepack filter when using the AV_STEREO3D_FRAMESEQUENCE format. Signed-off-by: Diego de Souza > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5083f4ad8e26806b2113d8001dcbf20e220a7309 --- libavcodec/nvenc.c | 102 ++++++++++++++++++++++++++++++++++++++++++++++++ libavcodec/nvenc.h | 9 +++++ libavcodec/nvenc_hevc.c | 5 ++- libavcodec/version.h | 2 +- 4 files changed, 116 insertions(+), 2 deletions(-) diff --git a/libavcodec/nvenc.c b/libavcodec/nvenc.c index 41a4dc55f4..a2457523b1 100644 --- a/libavcodec/nvenc.c +++ b/libavcodec/nvenc.c @@ -37,6 +37,8 @@ #include "libavutil/timecode_internal.h" #include "libavutil/mathematics.h" #include "libavutil/mastering_display_metadata.h" +#include "libavutil/stereo3d.h" +#include "libavutil/tdrdi.h" #include "atsc_a53.h" #include "codec_desc.h" #include "encode.h" @@ -660,6 +662,14 @@ static int nvenc_check_capabilities(AVCodecContext *avctx) ctx->support_dyn_bitrate = nvenc_check_cap(avctx, NV_ENC_CAPS_SUPPORT_DYN_BITRATE_CHANGE); +#ifdef NVENC_HAVE_MVHEVC + ctx->multiview_supported = nvenc_check_cap(avctx, NV_ENC_CAPS_SUPPORT_MVHEVC_ENCODE) > 0; + if(ctx->profile == NV_ENC_HEVC_PROFILE_MULTIVIEW_MAIN && !ctx->multiview_supported) { + av_log(avctx, AV_LOG_WARNING, "Multiview not supported by the device\n"); + return AVERROR(ENOSYS); + } +#endif + return 0; } @@ -1518,6 +1528,26 @@ static av_cold int nvenc_setup_hevc_config(AVCodecContext *avctx) hevc->outputPictureTimingSEI = 1; +#ifdef NVENC_HAVE_MVHEVC + if (ctx->multiview_supported && (ctx->profile == NV_ENC_HEVC_PROFILE_MAIN || ctx->profile == NV_ENC_HEVC_PROFILE_MULTIVIEW_MAIN)) { + const AVFrameSideData *sd_stereo3d = av_frame_side_data_get(avctx->decoded_side_data, avctx->nb_decoded_side_data, AV_FRAME_DATA_STEREO3D); + const AVFrameSideData *sd_tdrdi = av_frame_side_data_get(avctx->decoded_side_data, avctx->nb_decoded_side_data, AV_FRAME_DATA_3D_REFERENCE_DISPLAYS); + const AVStereo3D *stereo3d = sd_stereo3d ? (const AVStereo3D*)sd_stereo3d->data : NULL; + + if (sd_tdrdi && stereo3d && stereo3d->type == AV_STEREO3D_FRAMESEQUENCE) + ctx->profile = NV_ENC_HEVC_PROFILE_MULTIVIEW_MAIN; + + if (ctx->profile == NV_ENC_HEVC_PROFILE_MULTIVIEW_MAIN && stereo3d && + stereo3d->type != AV_STEREO3D_2D && + stereo3d->type != AV_STEREO3D_UNSPEC && + stereo3d->type != AV_STEREO3D_FRAMESEQUENCE) + { + av_log(avctx, AV_LOG_WARNING, "Unsupported multiview input, disabling multiview encoding.\n"); + ctx->profile = NV_ENC_HEVC_PROFILE_MAIN; + } + } +#endif + switch (ctx->profile) { case NV_ENC_HEVC_PROFILE_MAIN: cc->profileGUID = NV_ENC_HEVC_PROFILE_MAIN_GUID; @@ -1531,6 +1561,18 @@ static av_cold int nvenc_setup_hevc_config(AVCodecContext *avctx) cc->profileGUID = NV_ENC_HEVC_PROFILE_FREXT_GUID; avctx->profile = AV_PROFILE_HEVC_REXT; break; +#ifdef NVENC_HAVE_MVHEVC + case NV_ENC_HEVC_PROFILE_MULTIVIEW_MAIN: + cc->profileGUID = NV_ENC_HEVC_PROFILE_MAIN_GUID; + avctx->profile = AV_PROFILE_HEVC_MULTIVIEW_MAIN; + ctx->multiview = 1; + + hevc->enableMVHEVC = 1; + hevc->outputHevc3DReferenceDisplayInfo = 1; + + av_log(avctx, AV_LOG_VERBOSE, "Enabling MV HEVC encoding.\n"); + break; +#endif } // force setting profile as main10 if input is 10 bit or if it should be encoded as 10 bit @@ -1545,6 +1587,13 @@ static av_cold int nvenc_setup_hevc_config(AVCodecContext *avctx) avctx->profile = AV_PROFILE_HEVC_REXT; } +#ifdef NVENC_HAVE_MVHEVC + if (ctx->multiview && avctx->profile != AV_PROFILE_HEVC_MULTIVIEW_MAIN) { + av_log(avctx, AV_LOG_ERROR, "Multiview encoding only works for Main profile content.\n"); + return AVERROR(EINVAL); + } +#endif + hevc->chromaFormatIDC = IS_YUV444(ctx->data_pix_fmt) ? 3 : IS_YUV422(ctx->data_pix_fmt) ? 2 : 1; #ifdef NVENC_HAVE_NEW_BIT_DEPTH_API @@ -2565,6 +2614,9 @@ static int nvenc_set_timestamp(AVCodecContext *avctx, // This can be more than necessary, but we don't know the real reorder delay. delay = FFMAX(ctx->encode_config.frameIntervalP - 1, 0); +#ifdef NVENC_HAVE_MVHEVC + delay *= ctx->multiview ? 2 : 1; +#endif if (ctx->output_frame_num >= delay) { pkt->dts = timestamp_queue_dequeue(ctx->timestamp_list); ctx->output_frame_num++; @@ -3047,6 +3099,9 @@ static int nvenc_send_frame(AVCodecContext *avctx, const AVFrame *frame) MASTERING_DISPLAY_INFO mastering_disp_info = { 0 }; CONTENT_LIGHT_LEVEL content_light_level = { 0 }; #endif +#ifdef NVENC_HAVE_MVHEVC + HEVC_3D_REFERENCE_DISPLAY_INFO ref_disp_info = { 0 }; +#endif NvencContext *ctx = avctx->priv_data; NvencDynLoadFunctions *dl_fn = &ctx->nvenc_dload_funcs; @@ -3117,6 +3172,53 @@ static int nvenc_send_frame(AVCodecContext *avctx, const AVFrame *frame) return res; #endif +#ifdef NVENC_HAVE_MVHEVC + if (ctx->multiview) { + const AVFrameSideData *sd_tdrdi = av_frame_get_side_data(frame, AV_FRAME_DATA_3D_REFERENCE_DISPLAYS); + const AVFrameSideData *sd_view_id = av_frame_get_side_data(frame, AV_FRAME_DATA_VIEW_ID); + + if (sd_view_id) + ctx->next_view_id = *(int*)sd_view_id->data; + + pic_params.codecPicParams.hevcPicParams.viewId = ctx->next_view_id; + + if (sd_tdrdi) { + AV3DReferenceDisplaysInfo *tdrdi = (AV3DReferenceDisplaysInfo*)sd_tdrdi->data; + + ref_disp_info.refViewingDistanceFlag = tdrdi->ref_viewing_distance_flag; + ref_disp_info.precRefViewingDist = tdrdi->prec_ref_viewing_dist; + ref_disp_info.precRefDisplayWidth = tdrdi->prec_ref_display_width; + + ref_disp_info.numRefDisplaysMinus1 = tdrdi->num_ref_displays - 1; + + for (i = 0; i < tdrdi->num_ref_displays && + i < FF_ARRAY_ELEMS(ref_disp_info.leftViewId); i++) { + const AV3DReferenceDisplay *display = av_tdrdi_get_display(tdrdi, i); + ref_disp_info.leftViewId[i] = display->left_view_id; + ref_disp_info.rightViewId[i] = display->right_view_id; + ref_disp_info.exponentRefDisplayWidth[i] = display->exponent_ref_display_width; + ref_disp_info.mantissaRefDisplayWidth[i] = display->mantissa_ref_display_width; + ref_disp_info.exponentRefViewingDistance[i] = display->exponent_ref_viewing_distance; + ref_disp_info.mantissaRefViewingDistance[i] = display->mantissa_ref_viewing_distance; + ref_disp_info.additionalShiftPresentFlag[i] = display->additional_shift_present_flag; + ref_disp_info.numSampleShiftPlus512[i] = display->num_sample_shift + 512; + } + + pic_params.codecPicParams.hevcPicParams.p3DReferenceDisplayInfo = &ref_disp_info; + ctx->display_sei_sent = 1; + } else if (!ctx->display_sei_sent) { + ref_disp_info.precRefDisplayWidth = 31; + ref_disp_info.leftViewId[0] = 0; + ref_disp_info.rightViewId[0] = 1; + + pic_params.codecPicParams.hevcPicParams.p3DReferenceDisplayInfo = &ref_disp_info; + ctx->display_sei_sent = 1; + } + + ctx->next_view_id = !ctx->next_view_id; + } +#endif + res = nvenc_store_frame_data(avctx, &pic_params, frame); if (res < 0) return res; diff --git a/libavcodec/nvenc.h b/libavcodec/nvenc.h index 4b12846ed7..4a4d6730b1 100644 --- a/libavcodec/nvenc.h +++ b/libavcodec/nvenc.h @@ -107,6 +107,7 @@ typedef void ID3D11Device; #define NVENC_HAVE_AV1_UHQ_TUNING #define NVENC_HAVE_H264_AND_AV1_TEMPORAL_FILTER #define NVENC_HAVE_HEVC_AND_AV1_MASTERING_METADATA +#define NVENC_HAVE_MVHEVC #endif typedef struct NvencSurface @@ -180,6 +181,11 @@ enum { NV_ENC_HEVC_PROFILE_MAIN, NV_ENC_HEVC_PROFILE_MAIN_10, NV_ENC_HEVC_PROFILE_REXT, +#ifdef NVENC_HAVE_MVHEVC + NV_ENC_HEVC_PROFILE_MULTIVIEW_MAIN, +#endif + + NV_ENC_HEVC_PROFILE_COUNT }; enum { @@ -253,6 +259,7 @@ typedef struct NvencContext void *nvencoder; uint32_t frame_idx_counter; + uint32_t next_view_id; int preset; int profile; @@ -311,6 +318,8 @@ typedef struct NvencContext int split_encode_mode; int mdm, cll; int cbr_padding; + int multiview, multiview_supported; + int display_sei_sent; } NvencContext; int ff_nvenc_encode_init(AVCodecContext *avctx); diff --git a/libavcodec/nvenc_hevc.c b/libavcodec/nvenc_hevc.c index d74314f245..54e2fe323e 100644 --- a/libavcodec/nvenc_hevc.c +++ b/libavcodec/nvenc_hevc.c @@ -60,10 +60,13 @@ static const AVOption options[] = { { "ull", "Ultra low latency", 0, AV_OPT_TYPE_CONST, { .i64 = NV_ENC_TUNING_INFO_ULTRA_LOW_LATENCY }, 0, 0, VE, .unit = "tune" }, { "lossless", "Lossless", 0, AV_OPT_TYPE_CONST, { .i64 = NV_ENC_TUNING_INFO_LOSSLESS }, 0, 0, VE, .unit = "tune" }, #endif - { "profile", "Set the encoding profile", OFFSET(profile), AV_OPT_TYPE_INT, { .i64 = NV_ENC_HEVC_PROFILE_MAIN }, NV_ENC_HEVC_PROFILE_MAIN, AV_PROFILE_HEVC_REXT, VE, .unit = "profile" }, + { "profile", "Set the encoding profile", OFFSET(profile), AV_OPT_TYPE_INT, { .i64 = NV_ENC_HEVC_PROFILE_MAIN }, NV_ENC_HEVC_PROFILE_MAIN, NV_ENC_HEVC_PROFILE_COUNT - 1, VE, .unit = "profile" }, { "main", "", 0, AV_OPT_TYPE_CONST, { .i64 = NV_ENC_HEVC_PROFILE_MAIN }, 0, 0, VE, .unit = "profile" }, { "main10", "", 0, AV_OPT_TYPE_CONST, { .i64 = NV_ENC_HEVC_PROFILE_MAIN_10 }, 0, 0, VE, .unit = "profile" }, { "rext", "", 0, AV_OPT_TYPE_CONST, { .i64 = NV_ENC_HEVC_PROFILE_REXT }, 0, 0, VE, .unit = "profile" }, +#ifdef NVENC_HAVE_MVHEVC + { "mv", "", 0, AV_OPT_TYPE_CONST, { .i64 = NV_ENC_HEVC_PROFILE_MULTIVIEW_MAIN }, 0, 0, VE, .unit = "profile" }, +#endif { "level", "Set the encoding level restriction", OFFSET(level), AV_OPT_TYPE_INT, { .i64 = NV_ENC_LEVEL_AUTOSELECT }, NV_ENC_LEVEL_AUTOSELECT, NV_ENC_LEVEL_HEVC_62, VE, .unit = "level" }, { "auto", "", 0, AV_OPT_TYPE_CONST, { .i64 = NV_ENC_LEVEL_AUTOSELECT }, 0, 0, VE, .unit = "level" }, { "1", "", 0, AV_OPT_TYPE_CONST, { .i64 = NV_ENC_LEVEL_HEVC_1 }, 0, 0, VE, .unit = "level" }, diff --git a/libavcodec/version.h b/libavcodec/version.h index 3187c06855..83ad20990f 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -30,7 +30,7 @@ #include "version_major.h" #define LIBAVCODEC_VERSION_MINOR 4 -#define LIBAVCODEC_VERSION_MICRO 102 +#define LIBAVCODEC_VERSION_MICRO 103 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ LIBAVCODEC_VERSION_MINOR, \ From git at videolan.org Wed Jul 2 05:29:03 2025 From: git at videolan.org (=?UTF-8?Q?James_Almer?=) Date: Wed, 02 Jul 2025 02:29:03 +0000 Subject: [FFmpeg-cvslog] =?utf-8?q?doc/APIchanges=3A_add_missing_entries_?= =?utf-8?q?for_the_recent_changes?= Message-ID: <20250702022904.348B4412804@natalya.videolan.org> ffmpeg | branch: master | James Almer | Tue Jul 1 23:28:19 2025 -0300| [11d1b71c311d1a1432a280e0e1ee7bc0ba91d671] | committer: James Almer doc/APIchanges: add missing entries for the recent changes Signed-off-by: James Almer > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=11d1b71c311d1a1432a280e0e1ee7bc0ba91d671 --- doc/APIchanges | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/doc/APIchanges b/doc/APIchanges index 91710bb27d..9c03e541fd 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -2,6 +2,16 @@ The last version increases of all libraries were on 2025-03-28 API changes, most recent first: +2025-07-01 - 39d5a998bd - lavc 62.4.101 - packet.h + Add AV_PKT_DATA_3D_REFERENCE_DISPLAYS. + +2025-07-01 - b2e4b0e282 - lavu 60.4.101 - frame.h + Add AV_FRAME_DATA_3D_REFERENCE_DISPLAYS. + +2025-07-01 - 80a05bea4f - lavu 60.4.100 - tdrdi.h + Add AV3DReferenceDisplaysInfo and AV3DReferenceDisplay structs. + Add av_tdrdi_alloc() and av_tdrdi_get_display(). + 2025-05-21 - xxxxxxxxxx - lavu 60.3.100 - avassert.h Add av_unreachable() and av_assume() macros.