FaSTTUBe/GST-Tensordecoder-ov_ep
35
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

gst/matroska/matroska-mux.c: Fix mpeg4 input handling (#318847); also, while we're at it, fix media type for Motion-J...

Browse Source 
Original commit message from CVS:
Reviewed by: Tim-Philipp Müller  <tim at centricular dot net>
* gst/matroska/matroska-mux.c:
(gst_matroska_mux_video_pad_setcaps),
(gst_matroska_mux_audio_pad_setcaps):
Fix mpeg4 input handling (#318847); also, while we're at it,
fix media type for Motion-JPEG: should be image/jpeg.
This commit is contained in:
Tim-Philipp Müller 2005-10-18 18:06:14 +00:00
parent 0c40cd0a90
commit 2b6838d77c
2 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@ -1,3 +1,13 @@
2005-10-18 Michal Benes <michal dot benes at xeris dot cz>
Reviewed by: Tim-Philipp Müller <tim at centricular dot net>
* gst/matroska/matroska-mux.c:
(gst_matroska_mux_video_pad_setcaps),
(gst_matroska_mux_audio_pad_setcaps):
Fix mpeg4 input handling (#318847); also, while we're at it,
fix media type for Motion-JPEG: should be image/jpeg.
2005-10-18 Wim Taymans <wim@fluendo.com> 2005-10-18 Wim Taymans <wim@fluendo.com>
* gst/wavparse/gstwavparse.c: (gst_wavparse_handle_seek), * gst/wavparse/gstwavparse.c: (gst_wavparse_handle_seek),

12
gst/matroska/matroska-mux.c
View File

@ -73,7 +73,7 @@ static GstStaticPadTemplate videosink_templ =
COMMON_VIDEO_CAPS "; " COMMON_VIDEO_CAPS "; "
"video/x-msmpeg, " "video/x-msmpeg, "
COMMON_VIDEO_CAPS "; " COMMON_VIDEO_CAPS "; "
"video/x-jpeg, " "image/jpeg, "
COMMON_VIDEO_CAPS "; " COMMON_VIDEO_CAPS "; "
"video/x-raw-yuv, " "video/x-raw-yuv, "
"format = (fourcc) { YUY2, I420 }, " COMMON_VIDEO_CAPS) "format = (fourcc) { YUY2, I420 }, " COMMON_VIDEO_CAPS)
@ -473,7 +473,7 @@ gst_matroska_mux_video_pad_setcaps (GstPad * pad, GstCaps * caps)
gst_structure_get_fourcc (structure, "format", &videocontext->fourcc); gst_structure_get_fourcc (structure, "format", &videocontext->fourcc);
return TRUE; return TRUE;
} else if (!strcmp (mimetype, "video/x-jpeg")) { } else if (!strcmp (mimetype, "image/jpeg")) {
context->codec_id = g_strdup (GST_MATROSKA_CODEC_ID_VIDEO_MJPEG); context->codec_id = g_strdup (GST_MATROSKA_CODEC_ID_VIDEO_MJPEG);
return TRUE; return TRUE;
@ -568,9 +568,11 @@ gst_matroska_mux_video_pad_setcaps (GstPad * pad, GstCaps * caps)
case 2: case 2:
context->codec_id = g_strdup (GST_MATROSKA_CODEC_ID_VIDEO_MPEG2); context->codec_id = g_strdup (GST_MATROSKA_CODEC_ID_VIDEO_MPEG2);
break; break;
case 3: case 4:
context->codec_id = g_strdup (GST_MATROSKA_CODEC_ID_VIDEO_MPEG4_ASP); context->codec_id = g_strdup (GST_MATROSKA_CODEC_ID_VIDEO_MPEG4_ASP);
break; break;
default:
return FALSE;
} }
return TRUE; return TRUE;
@ -649,6 +651,8 @@ gst_matroska_mux_audio_pad_setcaps (GstPad * pad, GstCaps * caps)
context->default_duration = context->default_duration =
1152 * GST_SECOND / audiocontext->samplerate; 1152 * GST_SECOND / audiocontext->samplerate;
break; break;
default:
return FALSE;
} }
break; break;
} }
@ -658,6 +662,8 @@ gst_matroska_mux_audio_pad_setcaps (GstPad * pad, GstCaps * caps)
case 4: case 4:
context->codec_id = g_strdup (GST_MATROSKA_CODEC_ID_AUDIO_MPEG4 "MAIN"); context->codec_id = g_strdup (GST_MATROSKA_CODEC_ID_AUDIO_MPEG4 "MAIN");
break; break;
default:
return FALSE;
} }
return TRUE; return TRUE;