[FFmpeg-devel] [PATCH] Add support for parsing Matroska ContentEncKeyID

[Frank Galligan]

On Thu, Mar 7, 2013 at 9:58 AM, compn <tempn at twmi.rr.com> wrote:

> On Thu,  7 Mar 2013 08:11:38 -0800, Frank Galligan wrote:
> >From: Frank Galligan <fgalligan at chromium.org>
> >
> >This patch adds the enums for the ContentEncryption elements.
> >This patch also adds support for parsing the ContentEncKeyID. The
> >ContentEncKeyID is then base64 encoded and stored in the stream's
> >metadata.
> >---
> > libavformat/matroska.h    |  9 ++++++++
> > libavformat/matroskadec.c | 53
> ++++++++++++++++++++++++++++++++++++++++++-----
> > 2 files changed, 57 insertions(+), 5 deletions(-)
> >
> >diff --git a/libavformat/matroska.h b/libavformat/matroska.h
> >index 8e6f8cc..8a7e10b 100644
> >--- a/libavformat/matroska.h
> >+++ b/libavformat/matroska.h
> >@@ -137,6 +137,15 @@
> > #define MATROSKA_ID_ENCODINGCOMPALGO 0x4254
> > #define MATROSKA_ID_ENCODINGCOMPSETTINGS 0x4255
> >
> >+#define MATROSKA_ID_ENCODINGENCRYPTION 0x5035
> >+#define MATROSKA_ID_ENCODINGENCAESSETTINGS 0x47E7
> >+#define MATROSKA_ID_ENCODINGENCALGO 0x47E1
> >+#define MATROSKA_ID_ENCODINGENCKEYID 0x47E2
> >+#define MATROSKA_ID_ENCODINGSIGALGO 0x47E5
> >+#define MATROSKA_ID_ENCODINGSIGHASHALGO 0x47E6
> >+#define MATROSKA_ID_ENCODINGSIGKEYID 0x47E4
> >+#define MATROSKA_ID_ENCODINGSIGNATURE 0x47E3
>
> the rest of the file is sorted by the hex numbers order.
> not sure if its really important.
>
> -compn
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel at ffmpeg.org
> http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>

The ordering in the file seems to be all over the place. I followed the
Encoding elements order within the file, which is the order of
the elements defined in the Matroska spec.

Frank