virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

avformat/matroska: Move ff_matroska_video_stereo_plane to demuxer

Browse Source 
Only used there.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt
2023-08-11 01:53:54 +02:00
parent 088f08db71
commit 3fc9ed8497
3 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libavformat/matroska.c
View File

@@ -146,12 +146,6 @@ const char * const ff_matroska_video_stereo_mode[MATROSKA_VIDEO_STEREOMODE_TYPE_
"block_rl", "block_rl",
}; };
const char * const ff_matroska_video_stereo_plane[MATROSKA_VIDEO_STEREO_PLANE_COUNT] = {
"left",
"right",
"background",
};
int ff_mkv_stereo3d_conv(AVStream *st, MatroskaVideoStereoModeType stereo_mode) int ff_mkv_stereo3d_conv(AVStream *st, MatroskaVideoStereoModeType stereo_mode)
{ {
AVStereo3D *stereo; AVStereo3D *stereo;

1
libavformat/matroska.h
View File

@@ -387,7 +387,6 @@ extern const CodecTags ff_mkv_codec_tags[];
extern const CodecTags ff_webm_codec_tags[]; extern const CodecTags ff_webm_codec_tags[];
extern const AVMetadataConv ff_mkv_metadata_conv[]; extern const AVMetadataConv ff_mkv_metadata_conv[];
extern const char * const ff_matroska_video_stereo_mode[MATROSKA_VIDEO_STEREOMODE_TYPE_NB]; extern const char * const ff_matroska_video_stereo_mode[MATROSKA_VIDEO_STEREOMODE_TYPE_NB];
extern const char * const ff_matroska_video_stereo_plane[MATROSKA_VIDEO_STEREO_PLANE_COUNT];
/* AVStream Metadata tag keys for WebM Dash Manifest */ /* AVStream Metadata tag keys for WebM Dash Manifest */
#define INITIALIZATION_RANGE "webm_dash_manifest_initialization_range" #define INITIALIZATION_RANGE "webm_dash_manifest_initialization_range"

8
libavformat/matroskadec.c
View File

@@ -824,6 +824,12 @@ static const CodecMime mkv_mime_tags[] = {
{"" , AV_CODEC_ID_NONE} {"" , AV_CODEC_ID_NONE}
}; };
static const char * const matroska_video_stereo_plane[MATROSKA_VIDEO_STEREO_PLANE_COUNT] = {
"left",
"right",
"background",
};
static const char *const matroska_doctypes[] = { "matroska", "webm" }; static const char *const matroska_doctypes[] = { "matroska", "webm" };
/* /*
@@ -2991,7 +2997,7 @@ static int matroska_parse_tracks(AVFormatContext *s)
if (planes[j].type >= MATROSKA_VIDEO_STEREO_PLANE_COUNT) if (planes[j].type >= MATROSKA_VIDEO_STEREO_PLANE_COUNT)
continue; continue;
snprintf(buf, sizeof(buf), "%s_%d", snprintf(buf, sizeof(buf), "%s_%d",
ff_matroska_video_stereo_plane[planes[j].type], i); matroska_video_stereo_plane[planes[j].type], i);
for (k=0; k < matroska->tracks.nb_elem; k++) for (k=0; k < matroska->tracks.nb_elem; k++)
if (planes[j].uid == tracks[k].uid && tracks[k].stream) { if (planes[j].uid == tracks[k].uid && tracks[k].stream) {
av_dict_set(&tracks[k].stream->metadata, av_dict_set(&tracks[k].stream->metadata,