Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mpc-hc/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHendrik Leppkes <h.leppkes@gmail.com>2016-01-25 18:15:55 +0300
committerHendrik Leppkes <h.leppkes@gmail.com>2017-08-04 20:18:33 +0300
commit5ff8be68da0ee7fba28b239382f7fef81cdfdab6 (patch)
tree8222417891e13459fc8e765c9ea547effbb9a106
parent2cc24d02730e48bc1b900de1695b9e43f21ad2e3 (diff)
matroskadec_haali: export stereo_mode metadata
-rw-r--r--libavformat/matroskadec_haali.c14
1 files changed, 11 insertions, 3 deletions
diff --git a/libavformat/matroskadec_haali.c b/libavformat/matroskadec_haali.c
index c9348081b5..dce6f804fc 100644
--- a/libavformat/matroskadec_haali.c
+++ b/libavformat/matroskadec_haali.c
@@ -1169,11 +1169,19 @@ static int mkv_read_header(AVFormatContext *s)
}
/* export stereo mode flag as metadata tag */
- /* if (track->video.stereo_mode && track->video.stereo_mode < MATROSKA_VIDEO_STEREO_MODE_COUNT)
- av_dict_set(&st->metadata, "stereo_mode", matroska_video_stereo_mode[track->video.stereo_mode], 0);
+ if (info->AV.Video.StereoMode && info->AV.Video.StereoMode < MATROSKA_VIDEO_STEREOMODE_TYPE_NB)
+ av_dict_set(&st->metadata, "stereo_mode", ff_matroska_video_stereo_mode[info->AV.Video.StereoMode], 0);
+
+ // add stream level stereo3d side data if it is a supported format
+ if (info->AV.Video.StereoMode < MATROSKA_VIDEO_STEREOMODE_TYPE_NB &&
+ info->AV.Video.StereoMode != 10 && info->AV.Video.StereoMode != 12) {
+ int ret = ff_mkv_stereo3d_conv(st, info->AV.Video.StereoMode);
+ if (ret < 0)
+ return ret;
+ }
// if we have virtual track, mark the real tracks
- for (j=0; j < track->operation.combine_planes.nb_elem; j++) {
+ /*for (j=0; j < track->operation.combine_planes.nb_elem; j++) {
char buf[32];
if (planes[j].type >= MATROSKA_VIDEO_STEREO_PLANE_COUNT)
continue;