On Thu, Jan 28, 2016 at 10:42:12AM -0800, Ram Natarajan wrote: > Folks, > This patch makes dashenc.c handle vp8/vp9 video codecs and vorbis codec for > audio. The current webm_chunk and webm_dash_manifest is a two stage process > and not really suitable for realti > me "live" dash mpd creation. > I have tested this for both webm and mp4 chunk creation - both for live and > static mpd types. > Since this is the first time I am submitting a patch, I am not sure if I am > doing all the right things - I followed the patch submission process > described in https://www.ffmpeg.org/developer.html. > -Ram
> dashenc.c | 277
> +++++++++++++++++++++++++++++++++++++++++++++++---------------
> 1 file changed, 214 insertions(+), 63 deletions(-)
> 8a290462a2d5881e9fdb2cb5165336825a132eff
> 0001-Added-webm-support-for-dash.-This-would-replace-make.patch
> From 34ad6ca077c11f09e21c1ed12fa1af7de6e428f3 Mon Sep 17 00:00:00 2001
> From: Ram Natarajan <ram95...@gmail.com>
> Date: Thu, 28 Jan 2016 10:34:28 -0800
> Subject: [PATCH] Added webm support for dash. This would replace/make
> redundant webm_chunk and webm_dash_manifest muxers. The current webm_chunk
> and webm_dash_manifest are a two stage process and not suitable for live
> streaming. Reorganized chunk creation so that both webm and mp4 chunks can be
> produced.
doesnt apply cleanly (anymore)
Applying: Added webm support for dash. This would replace/make redundant
webm_chunk and webm_dash_manifest muxers. The current webm_chunk and
webm_dash_manifest are a two stage process and not suitable for live streaming.
Reorganized chunk creation so that both webm and mp4 chunks can be produced.
ffmpeg/.git/rebase-apply/patch:145: trailing whitespace.
dash_fill_tmpl_params(os->filename, sizeof(os->filename),
c->media_seg_name_full, stream_idx,
ffmpeg/.git/rebase-apply/patch:305: trailing whitespace.
if ((ret = ctx->oformat->write_header(ctx)) < 0) {
ffmpeg/.git/rebase-apply/patch:312: trailing whitespace.
av_log(s, AV_LOG_DEBUG, "dash_write_header: webm: %d: closing
os->out %p, init_range_length = %d\n",
warning: 3 lines add whitespace errors.
Using index info to reconstruct a base tree...
<stdin>:145: trailing whitespace.
dash_fill_tmpl_params(os->filename, sizeof(os->filename),
c->media_seg_name_full, stream_idx,
<stdin>:305: trailing whitespace.
if ((ret = ctx->oformat->write_header(ctx)) < 0) {
<stdin>:312: trailing whitespace.
av_log(s, AV_LOG_DEBUG, "dash_write_header: webm: %d: closing
os->out %p, init_range_length = %d\n",
warning: 3 lines applied after fixing whitespace errors.
Falling back to patching base and 3-way merge...
Auto-merging libavformat/dashenc.c
CONFLICT (content): Merge conflict in libavformat/dashenc.c
Failed to merge in the changes.
Patch failed at 0001 Added webm support for dash. This would replace/make
redundant webm_chunk and webm_dash_manifest muxers. The current webm_chunk and
webm_dash_manifest are a two stage process and not suitable for live streaming.
Reorganized chunk creation so that both webm and mp4 chunks can be produced.
When you have resolved this problem run "git am --resolved".
If you would prefer to skip this patch, instead run "git am --skip".
To restore the original branch and stop patching run "git am --abort".
[...]
--
Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB
Dictatorship naturally arises out of democracy, and the most aggravated
form of tyranny and slavery out of the most extreme liberty. -- Plato
signature.asc
Description: Digital signature
_______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
