Skip to content

F
ffmpeg.wasm-core
Commit 84cfce9f authored by Keiji Costantini's avatar Keiji Costantini Committed by Diego Biurrun
Browse files
Options

matroskadec: K&R formatting cosmetics 

Also sort #includes into canonical order.
Signed-off-by: 's avatarDiego Biurrun <diego@biurrun.de>
parent 77eed91f
Show whitespace changes
Inline Side-by-side
Showing with 551 additions and 469 deletions
libavformat/matroskadec.c
View file @ 84cfce9f
...@@ -28,28 +28,33 @@ ...@@ -28,28 +28,33 @@
* @see specs available on the Matroska project page: http://www.matroska.org/ * @see specs available on the Matroska project page: http://www.matroska.org/
*/ */
#include "config.h"
#include <stdio.h> #include <stdio.h>
#if CONFIG_BZLIB
#include <bzlib.h>
#endif
#if CONFIG_ZLIB
#include <zlib.h>
#endif
#include "libavutil/avstring.h"
#include "libavutil/dict.h"
#include "libavutil/intfloat.h"
#include "libavutil/intreadwrite.h"
#include "libavutil/lzo.h"
#include "libavcodec/bytestream.h"
#include "libavcodec/mpeg4audio.h"
#include "avformat.h" #include "avformat.h"
#include "internal.h"
#include "avio_internal.h" #include "avio_internal.h"
#include "internal.h"
#include "isom.h"
#include "matroska.h"
/* For ff_codec_get_id(). */ /* For ff_codec_get_id(). */
#include "riff.h" #include "riff.h"
#include "isom.h"
#include "rmsipr.h" #include "rmsipr.h"
#include "matroska.h"
#include "libavcodec/bytestream.h"
#include "libavcodec/mpeg4audio.h"
#include "libavutil/intfloat.h"
#include "libavutil/intreadwrite.h"
#include "libavutil/avstring.h"
#include "libavutil/lzo.h"
#include "libavutil/dict.h"
#if CONFIG_ZLIB
#include <zlib.h>
#endif
#if CONFIG_BZLIB
#include <bzlib.h>
#endif
typedef enum { typedef enum {
EBML_NONE, EBML_NONE,
...@@ -270,25 +275,25 @@ typedef struct { ...@@ -270,25 +275,25 @@ typedef struct {
} MatroskaBlock; } MatroskaBlock;
static EbmlSyntax ebml_header[] = { static EbmlSyntax ebml_header[] = {
{ EBML_ID_EBMLREADVERSION, EBML_UINT, 0, offsetof(Ebml,version), {.u=EBML_VERSION} }, { EBML_ID_EBMLREADVERSION, EBML_UINT, 0, offsetof(Ebml, version), { .u = EBML_VERSION } },
{ EBML_ID_EBMLMAXSIZELENGTH, EBML_UINT, 0, offsetof(Ebml,max_size), {.u=8} }, { EBML_ID_EBMLMAXSIZELENGTH, EBML_UINT, 0, offsetof(Ebml, max_size), { .u = 8 } },
{ EBML_ID_EBMLMAXIDLENGTH, EBML_UINT, 0, offsetof(Ebml,id_length), {.u=4} }, { EBML_ID_EBMLMAXIDLENGTH, EBML_UINT, 0, offsetof(Ebml, id_length), { .u = 4 } },
{ EBML_ID_DOCTYPE, EBML_STR, 0, offsetof(Ebml,doctype), {.s="(none)"} }, { EBML_ID_DOCTYPE, EBML_STR, 0, offsetof(Ebml, doctype), { .s = "(none)" } },
{ EBML_ID_DOCTYPEREADVERSION, EBML_UINT, 0, offsetof(Ebml,doctype_version), {.u=1} }, { EBML_ID_DOCTYPEREADVERSION, EBML_UINT, 0, offsetof(Ebml, doctype_version), { .u = 1 } },
{ EBML_ID_EBMLVERSION, EBML_NONE }, { EBML_ID_EBMLVERSION, EBML_NONE },
{ EBML_ID_DOCTYPEVERSION, EBML_NONE }, { EBML_ID_DOCTYPEVERSION, EBML_NONE },
{ 0 } { 0 }
}; };
static EbmlSyntax ebml_syntax[] = { static EbmlSyntax ebml_syntax[] = {
{ EBML_ID_HEADER, EBML_NEST, 0, 0, {.n=ebml_header} }, { EBML_ID_HEADER, EBML_NEST, 0, 0, { .n = ebml_header } },
{ 0 } { 0 }
}; };
static EbmlSyntax matroska_info[] = { static EbmlSyntax matroska_info[] = {
{ MATROSKA_ID_TIMECODESCALE, EBML_UINT, 0, offsetof(MatroskaDemuxContext,time_scale), {.u=1000000} }, { MATROSKA_ID_TIMECODESCALE, EBML_UINT, 0, offsetof(MatroskaDemuxContext, time_scale), { .u = 1000000 } },
{ MATROSKA_ID_DURATION, EBML_FLOAT, 0, offsetof(MatroskaDemuxContext,duration) }, { MATROSKA_ID_DURATION, EBML_FLOAT, 0, offsetof(MatroskaDemuxContext, duration) },
{ MATROSKA_ID_TITLE, EBML_UTF8, 0, offsetof(MatroskaDemuxContext,title) }, { MATROSKA_ID_TITLE, EBML_UTF8, 0, offsetof(MatroskaDemuxContext, title) },
{ MATROSKA_ID_WRITINGAPP, EBML_NONE }, { MATROSKA_ID_WRITINGAPP, EBML_NONE },
{ MATROSKA_ID_MUXINGAPP, EBML_NONE }, { MATROSKA_ID_MUXINGAPP, EBML_NONE },
{ MATROSKA_ID_DATEUTC, EBML_NONE }, { MATROSKA_ID_DATEUTC, EBML_NONE },
...@@ -297,65 +302,65 @@ static EbmlSyntax matroska_info[] = { ...@@ -297,65 +302,65 @@ static EbmlSyntax matroska_info[] = {
}; };
static EbmlSyntax matroska_track_video[] = { static EbmlSyntax matroska_track_video[] = {
{ MATROSKA_ID_VIDEOFRAMERATE, EBML_FLOAT,0, offsetof(MatroskaTrackVideo,frame_rate) }, { MATROSKA_ID_VIDEOFRAMERATE, EBML_FLOAT, 0, offsetof(MatroskaTrackVideo, frame_rate) },
{ MATROSKA_ID_VIDEODISPLAYWIDTH, EBML_UINT, 0, offsetof(MatroskaTrackVideo,display_width) }, { MATROSKA_ID_VIDEODISPLAYWIDTH, EBML_UINT, 0, offsetof(MatroskaTrackVideo, display_width) },
{ MATROSKA_ID_VIDEODISPLAYHEIGHT, EBML_UINT, 0, offsetof(MatroskaTrackVideo,display_height) }, { MATROSKA_ID_VIDEODISPLAYHEIGHT, EBML_UINT, 0, offsetof(MatroskaTrackVideo, display_height) },
{ MATROSKA_ID_VIDEOPIXELWIDTH, EBML_UINT, 0, offsetof(MatroskaTrackVideo,pixel_width) }, { MATROSKA_ID_VIDEOPIXELWIDTH, EBML_UINT, 0, offsetof(MatroskaTrackVideo, pixel_width) },
{ MATROSKA_ID_VIDEOPIXELHEIGHT, EBML_UINT, 0, offsetof(MatroskaTrackVideo,pixel_height) }, { MATROSKA_ID_VIDEOPIXELHEIGHT, EBML_UINT, 0, offsetof(MatroskaTrackVideo, pixel_height) },
{ MATROSKA_ID_VIDEOCOLORSPACE, EBML_UINT, 0, offsetof(MatroskaTrackVideo,fourcc) }, { MATROSKA_ID_VIDEOCOLORSPACE, EBML_UINT, 0, offsetof(MatroskaTrackVideo, fourcc) },
{ MATROSKA_ID_VIDEOPIXELCROPB, EBML_NONE }, { MATROSKA_ID_VIDEOPIXELCROPB, EBML_NONE },
{ MATROSKA_ID_VIDEOPIXELCROPT, EBML_NONE }, { MATROSKA_ID_VIDEOPIXELCROPT, EBML_NONE },
{ MATROSKA_ID_VIDEOPIXELCROPL, EBML_NONE }, { MATROSKA_ID_VIDEOPIXELCROPL, EBML_NONE },
{ MATROSKA_ID_VIDEOPIXELCROPR, EBML_NONE }, { MATROSKA_ID_VIDEOPIXELCROPR, EBML_NONE },
{ MATROSKA_ID_VIDEODISPLAYUNIT, EBML_NONE }, { MATROSKA_ID_VIDEODISPLAYUNIT, EBML_NONE },
{ MATROSKA_ID_VIDEOFLAGINTERLACED,EBML_NONE }, { MATROSKA_ID_VIDEOFLAGINTERLACED, EBML_NONE },
{ MATROSKA_ID_VIDEOSTEREOMODE, EBML_NONE }, { MATROSKA_ID_VIDEOSTEREOMODE, EBML_NONE },
{ MATROSKA_ID_VIDEOASPECTRATIO, EBML_NONE }, { MATROSKA_ID_VIDEOASPECTRATIO, EBML_NONE },
{ 0 } { 0 }
}; };
static EbmlSyntax matroska_track_audio[] = { static EbmlSyntax matroska_track_audio[] = {
{ MATROSKA_ID_AUDIOSAMPLINGFREQ, EBML_FLOAT,0, offsetof(MatroskaTrackAudio,samplerate), {.f=8000.0} }, { MATROSKA_ID_AUDIOSAMPLINGFREQ, EBML_FLOAT, 0, offsetof(MatroskaTrackAudio, samplerate), { .f = 8000.0 } },
{ MATROSKA_ID_AUDIOOUTSAMPLINGFREQ,EBML_FLOAT,0,offsetof(MatroskaTrackAudio,out_samplerate) }, { MATROSKA_ID_AUDIOOUTSAMPLINGFREQ, EBML_FLOAT, 0, offsetof(MatroskaTrackAudio, out_samplerate) },
{ MATROSKA_ID_AUDIOBITDEPTH, EBML_UINT, 0, offsetof(MatroskaTrackAudio,bitdepth) }, { MATROSKA_ID_AUDIOBITDEPTH, EBML_UINT, 0, offsetof(MatroskaTrackAudio, bitdepth) },
{ MATROSKA_ID_AUDIOCHANNELS, EBML_UINT, 0, offsetof(MatroskaTrackAudio,channels), {.u=1} }, { MATROSKA_ID_AUDIOCHANNELS, EBML_UINT, 0, offsetof(MatroskaTrackAudio, channels), { .u = 1 } },
{ 0 } { 0 }
}; };
static EbmlSyntax matroska_track_encoding_compression[] = { static EbmlSyntax matroska_track_encoding_compression[] = {
{ MATROSKA_ID_ENCODINGCOMPALGO, EBML_UINT, 0, offsetof(MatroskaTrackCompression,algo), {.u=0} }, { MATROSKA_ID_ENCODINGCOMPALGO, EBML_UINT, 0, offsetof(MatroskaTrackCompression, algo), { .u = 0 } },
{ MATROSKA_ID_ENCODINGCOMPSETTINGS,EBML_BIN, 0, offsetof(MatroskaTrackCompression,settings) }, { MATROSKA_ID_ENCODINGCOMPSETTINGS, EBML_BIN, 0, offsetof(MatroskaTrackCompression, settings) },
{ 0 } { 0 }
}; };
static EbmlSyntax matroska_track_encoding[] = { static EbmlSyntax matroska_track_encoding[] = {
{ MATROSKA_ID_ENCODINGSCOPE, EBML_UINT, 0, offsetof(MatroskaTrackEncoding,scope), {.u=1} }, { MATROSKA_ID_ENCODINGSCOPE, EBML_UINT, 0, offsetof(MatroskaTrackEncoding, scope), { .u = 1 } },
{ MATROSKA_ID_ENCODINGTYPE, EBML_UINT, 0, offsetof(MatroskaTrackEncoding,type), {.u=0} }, { MATROSKA_ID_ENCODINGTYPE, EBML_UINT, 0, offsetof(MatroskaTrackEncoding, type), { .u = 0 } },
{ MATROSKA_ID_ENCODINGCOMPRESSION,EBML_NEST, 0, offsetof(MatroskaTrackEncoding,compression), {.n=matroska_track_encoding_compression} }, { MATROSKA_ID_ENCODINGCOMPRESSION, EBML_NEST, 0, offsetof(MatroskaTrackEncoding, compression), { .n = matroska_track_encoding_compression } },
{ MATROSKA_ID_ENCODINGORDER, EBML_NONE }, { MATROSKA_ID_ENCODINGORDER, EBML_NONE },
{ 0 } { 0 }
}; };
static EbmlSyntax matroska_track_encodings[] = { static EbmlSyntax matroska_track_encodings[] = {
{ MATROSKA_ID_TRACKCONTENTENCODING, EBML_NEST, sizeof(MatroskaTrackEncoding), offsetof(MatroskaTrack,encodings), {.n=matroska_track_encoding} }, { MATROSKA_ID_TRACKCONTENTENCODING, EBML_NEST, sizeof(MatroskaTrackEncoding), offsetof(MatroskaTrack, encodings), { .n = matroska_track_encoding } },
{ 0 } { 0 }
}; };
static EbmlSyntax matroska_track[] = { static EbmlSyntax matroska_track[] = {
{ MATROSKA_ID_TRACKNUMBER, EBML_UINT, 0, offsetof(MatroskaTrack,num) }, { MATROSKA_ID_TRACKNUMBER, EBML_UINT, 0, offsetof(MatroskaTrack, num) },
{ MATROSKA_ID_TRACKNAME, EBML_UTF8, 0, offsetof(MatroskaTrack,name) }, { MATROSKA_ID_TRACKNAME, EBML_UTF8, 0, offsetof(MatroskaTrack, name) },
{ MATROSKA_ID_TRACKUID, EBML_UINT, 0, offsetof(MatroskaTrack,uid) }, { MATROSKA_ID_TRACKUID, EBML_UINT, 0, offsetof(MatroskaTrack, uid) },
{ MATROSKA_ID_TRACKTYPE, EBML_UINT, 0, offsetof(MatroskaTrack,type) }, { MATROSKA_ID_TRACKTYPE, EBML_UINT, 0, offsetof(MatroskaTrack, type) },
{ MATROSKA_ID_CODECID, EBML_STR, 0, offsetof(MatroskaTrack,codec_id) }, { MATROSKA_ID_CODECID, EBML_STR, 0, offsetof(MatroskaTrack, codec_id) },
{ MATROSKA_ID_CODECPRIVATE, EBML_BIN, 0, offsetof(MatroskaTrack,codec_priv) }, { MATROSKA_ID_CODECPRIVATE, EBML_BIN, 0, offsetof(MatroskaTrack, codec_priv) },
{ MATROSKA_ID_TRACKLANGUAGE, EBML_UTF8, 0, offsetof(MatroskaTrack,language), {.s="eng"} }, { MATROSKA_ID_TRACKLANGUAGE, EBML_UTF8, 0, offsetof(MatroskaTrack, language), { .s = "eng" } },
{ MATROSKA_ID_TRACKDEFAULTDURATION, EBML_UINT, 0, offsetof(MatroskaTrack,default_duration) }, { MATROSKA_ID_TRACKDEFAULTDURATION, EBML_UINT, 0, offsetof(MatroskaTrack, default_duration) },
{ MATROSKA_ID_TRACKTIMECODESCALE, EBML_FLOAT,0, offsetof(MatroskaTrack,time_scale), {.f=1.0} }, { MATROSKA_ID_TRACKTIMECODESCALE, EBML_FLOAT, 0, offsetof(MatroskaTrack, time_scale), { .f = 1.0 } },
{ MATROSKA_ID_TRACKFLAGDEFAULT, EBML_UINT, 0, offsetof(MatroskaTrack,flag_default), {.u=1} }, { MATROSKA_ID_TRACKFLAGDEFAULT, EBML_UINT, 0, offsetof(MatroskaTrack, flag_default), { .u = 1 } },
{ MATROSKA_ID_TRACKFLAGFORCED, EBML_UINT, 0, offsetof(MatroskaTrack,flag_forced), {.u=0} }, { MATROSKA_ID_TRACKFLAGFORCED, EBML_UINT, 0, offsetof(MatroskaTrack, flag_forced), { .u = 0 } },
{ MATROSKA_ID_TRACKVIDEO, EBML_NEST, 0, offsetof(MatroskaTrack,video), {.n=matroska_track_video} }, { MATROSKA_ID_TRACKVIDEO, EBML_NEST, 0, offsetof(MatroskaTrack, video), { .n = matroska_track_video } },
{ MATROSKA_ID_TRACKAUDIO, EBML_NEST, 0, offsetof(MatroskaTrack,audio), {.n=matroska_track_audio} }, { MATROSKA_ID_TRACKAUDIO, EBML_NEST, 0, offsetof(MatroskaTrack, audio), { .n = matroska_track_audio } },
{ MATROSKA_ID_TRACKCONTENTENCODINGS,EBML_NEST, 0, 0, {.n=matroska_track_encodings} }, { MATROSKA_ID_TRACKCONTENTENCODINGS, EBML_NEST, 0, 0, { .n = matroska_track_encodings } },
{ MATROSKA_ID_TRACKFLAGENABLED, EBML_NONE }, { MATROSKA_ID_TRACKFLAGENABLED, EBML_NONE },
{ MATROSKA_ID_TRACKFLAGLACING, EBML_NONE }, { MATROSKA_ID_TRACKFLAGLACING, EBML_NONE },
{ MATROSKA_ID_CODECNAME, EBML_NONE }, { MATROSKA_ID_CODECNAME, EBML_NONE },
...@@ -369,35 +374,35 @@ static EbmlSyntax matroska_track[] = { ...@@ -369,35 +374,35 @@ static EbmlSyntax matroska_track[] = {
}; };
static EbmlSyntax matroska_tracks[] = { static EbmlSyntax matroska_tracks[] = {
{ MATROSKA_ID_TRACKENTRY, EBML_NEST, sizeof(MatroskaTrack), offsetof(MatroskaDemuxContext,tracks), {.n=matroska_track} }, { MATROSKA_ID_TRACKENTRY, EBML_NEST, sizeof(MatroskaTrack), offsetof(MatroskaDemuxContext, tracks), { .n = matroska_track } },
{ 0 } { 0 }
}; };
static EbmlSyntax matroska_attachment[] = { static EbmlSyntax matroska_attachment[] = {
{ MATROSKA_ID_FILEUID, EBML_UINT, 0, offsetof(MatroskaAttachement,uid) }, { MATROSKA_ID_FILEUID, EBML_UINT, 0, offsetof(MatroskaAttachement, uid) },
{ MATROSKA_ID_FILENAME, EBML_UTF8, 0, offsetof(MatroskaAttachement,filename) }, { MATROSKA_ID_FILENAME, EBML_UTF8, 0, offsetof(MatroskaAttachement, filename) },
{ MATROSKA_ID_FILEMIMETYPE, EBML_STR, 0, offsetof(MatroskaAttachement,mime) }, { MATROSKA_ID_FILEMIMETYPE, EBML_STR, 0, offsetof(MatroskaAttachement, mime) },
{ MATROSKA_ID_FILEDATA, EBML_BIN, 0, offsetof(MatroskaAttachement,bin) }, { MATROSKA_ID_FILEDATA, EBML_BIN, 0, offsetof(MatroskaAttachement, bin) },
{ MATROSKA_ID_FILEDESC, EBML_NONE }, { MATROSKA_ID_FILEDESC, EBML_NONE },
{ 0 } { 0 }
}; };
static EbmlSyntax matroska_attachments[] = { static EbmlSyntax matroska_attachments[] = {
{ MATROSKA_ID_ATTACHEDFILE, EBML_NEST, sizeof(MatroskaAttachement), offsetof(MatroskaDemuxContext,attachments), {.n=matroska_attachment} }, { MATROSKA_ID_ATTACHEDFILE, EBML_NEST, sizeof(MatroskaAttachement), offsetof(MatroskaDemuxContext, attachments), { .n = matroska_attachment } },
{ 0 } { 0 }
}; };
static EbmlSyntax matroska_chapter_display[] = { static EbmlSyntax matroska_chapter_display[] = {
{ MATROSKA_ID_CHAPSTRING, EBML_UTF8, 0, offsetof(MatroskaChapter,title) }, { MATROSKA_ID_CHAPSTRING, EBML_UTF8, 0, offsetof(MatroskaChapter, title) },
{ MATROSKA_ID_CHAPLANG, EBML_NONE }, { MATROSKA_ID_CHAPLANG, EBML_NONE },
{ 0 } { 0 }
}; };
static EbmlSyntax matroska_chapter_entry[] = { static EbmlSyntax matroska_chapter_entry[] = {
{ MATROSKA_ID_CHAPTERTIMESTART, EBML_UINT, 0, offsetof(MatroskaChapter,start), {.u=AV_NOPTS_VALUE} }, { MATROSKA_ID_CHAPTERTIMESTART, EBML_UINT, 0, offsetof(MatroskaChapter, start), { .u = AV_NOPTS_VALUE } },
{ MATROSKA_ID_CHAPTERTIMEEND, EBML_UINT, 0, offsetof(MatroskaChapter,end), {.u=AV_NOPTS_VALUE} }, { MATROSKA_ID_CHAPTERTIMEEND, EBML_UINT, 0, offsetof(MatroskaChapter, end), { .u = AV_NOPTS_VALUE } },
{ MATROSKA_ID_CHAPTERUID, EBML_UINT, 0, offsetof(MatroskaChapter,uid) }, { MATROSKA_ID_CHAPTERUID, EBML_UINT, 0, offsetof(MatroskaChapter, uid) },
{ MATROSKA_ID_CHAPTERDISPLAY, EBML_NEST, 0, 0, {.n=matroska_chapter_display} }, { MATROSKA_ID_CHAPTERDISPLAY, EBML_NEST, 0, 0, { .n = matroska_chapter_display } },
{ MATROSKA_ID_CHAPTERFLAGHIDDEN, EBML_NONE }, { MATROSKA_ID_CHAPTERFLAGHIDDEN, EBML_NONE },
{ MATROSKA_ID_CHAPTERFLAGENABLED, EBML_NONE }, { MATROSKA_ID_CHAPTERFLAGENABLED, EBML_NONE },
{ MATROSKA_ID_CHAPTERPHYSEQUIV, EBML_NONE }, { MATROSKA_ID_CHAPTERPHYSEQUIV, EBML_NONE },
...@@ -406,7 +411,7 @@ static EbmlSyntax matroska_chapter_entry[] = { ...@@ -406,7 +411,7 @@ static EbmlSyntax matroska_chapter_entry[] = {
}; };
static EbmlSyntax matroska_chapter[] = { static EbmlSyntax matroska_chapter[] = {
{ MATROSKA_ID_CHAPTERATOM, EBML_NEST, sizeof(MatroskaChapter), offsetof(MatroskaDemuxContext,chapters), {.n=matroska_chapter_entry} }, { MATROSKA_ID_CHAPTERATOM, EBML_NEST, sizeof(MatroskaChapter), offsetof(MatroskaDemuxContext, chapters), { .n = matroska_chapter_entry } },
{ MATROSKA_ID_EDITIONUID, EBML_NONE }, { MATROSKA_ID_EDITIONUID, EBML_NONE },
{ MATROSKA_ID_EDITIONFLAGHIDDEN, EBML_NONE }, { MATROSKA_ID_EDITIONFLAGHIDDEN, EBML_NONE },
{ MATROSKA_ID_EDITIONFLAGDEFAULT, EBML_NONE }, { MATROSKA_ID_EDITIONFLAGDEFAULT, EBML_NONE },
...@@ -415,107 +420,107 @@ static EbmlSyntax matroska_chapter[] = { ...@@ -415,107 +420,107 @@ static EbmlSyntax matroska_chapter[] = {
}; };
static EbmlSyntax matroska_chapters[] = { static EbmlSyntax matroska_chapters[] = {
{ MATROSKA_ID_EDITIONENTRY, EBML_NEST, 0, 0, {.n=matroska_chapter} }, { MATROSKA_ID_EDITIONENTRY, EBML_NEST, 0, 0, { .n = matroska_chapter } },
{ 0 } { 0 }
}; };
static EbmlSyntax matroska_index_pos[] = { static EbmlSyntax matroska_index_pos[] = {
{ MATROSKA_ID_CUETRACK, EBML_UINT, 0, offsetof(MatroskaIndexPos,track) }, { MATROSKA_ID_CUETRACK, EBML_UINT, 0, offsetof(MatroskaIndexPos, track) },
{ MATROSKA_ID_CUECLUSTERPOSITION, EBML_UINT, 0, offsetof(MatroskaIndexPos,pos) }, { MATROSKA_ID_CUECLUSTERPOSITION, EBML_UINT, 0, offsetof(MatroskaIndexPos, pos) },
{ MATROSKA_ID_CUEBLOCKNUMBER, EBML_NONE }, { MATROSKA_ID_CUEBLOCKNUMBER, EBML_NONE },
{ 0 } { 0 }
}; };
static EbmlSyntax matroska_index_entry[] = { static EbmlSyntax matroska_index_entry[] = {
{ MATROSKA_ID_CUETIME, EBML_UINT, 0, offsetof(MatroskaIndex,time) }, { MATROSKA_ID_CUETIME, EBML_UINT, 0, offsetof(MatroskaIndex, time) },
{ MATROSKA_ID_CUETRACKPOSITION, EBML_NEST, sizeof(MatroskaIndexPos), offsetof(MatroskaIndex,pos), {.n=matroska_index_pos} }, { MATROSKA_ID_CUETRACKPOSITION, EBML_NEST, sizeof(MatroskaIndexPos), offsetof(MatroskaIndex, pos), { .n = matroska_index_pos } },
{ 0 } { 0 }
}; };
static EbmlSyntax matroska_index[] = { static EbmlSyntax matroska_index[] = {
{ MATROSKA_ID_POINTENTRY, EBML_NEST, sizeof(MatroskaIndex), offsetof(MatroskaDemuxContext,index), {.n=matroska_index_entry} }, { MATROSKA_ID_POINTENTRY, EBML_NEST, sizeof(MatroskaIndex), offsetof(MatroskaDemuxContext, index), { .n = matroska_index_entry } },
{ 0 } { 0 }
}; };
static EbmlSyntax matroska_simpletag[] = { static EbmlSyntax matroska_simpletag[] = {
{ MATROSKA_ID_TAGNAME, EBML_UTF8, 0, offsetof(MatroskaTag,name) }, { MATROSKA_ID_TAGNAME, EBML_UTF8, 0, offsetof(MatroskaTag, name) },
{ MATROSKA_ID_TAGSTRING, EBML_UTF8, 0, offsetof(MatroskaTag,string) }, { MATROSKA_ID_TAGSTRING, EBML_UTF8, 0, offsetof(MatroskaTag, string) },
{ MATROSKA_ID_TAGLANG, EBML_STR, 0, offsetof(MatroskaTag,lang), {.s="und"} }, { MATROSKA_ID_TAGLANG, EBML_STR, 0, offsetof(MatroskaTag, lang), { .s = "und" } },
{ MATROSKA_ID_TAGDEFAULT, EBML_UINT, 0, offsetof(MatroskaTag,def) }, { MATROSKA_ID_TAGDEFAULT, EBML_UINT, 0, offsetof(MatroskaTag, def) },
{ MATROSKA_ID_TAGDEFAULT_BUG, EBML_UINT, 0, offsetof(MatroskaTag,def) }, { MATROSKA_ID_TAGDEFAULT_BUG, EBML_UINT, 0, offsetof(MatroskaTag, def) },
{ MATROSKA_ID_SIMPLETAG, EBML_NEST, sizeof(MatroskaTag), offsetof(MatroskaTag,sub), {.n=matroska_simpletag} }, { MATROSKA_ID_SIMPLETAG, EBML_NEST, sizeof(MatroskaTag), offsetof(MatroskaTag, sub), { .n = matroska_simpletag } },
{ 0 } { 0 }
}; };
static EbmlSyntax matroska_tagtargets[] = { static EbmlSyntax matroska_tagtargets[] = {
{ MATROSKA_ID_TAGTARGETS_TYPE, EBML_STR, 0, offsetof(MatroskaTagTarget,type) }, { MATROSKA_ID_TAGTARGETS_TYPE, EBML_STR, 0, offsetof(MatroskaTagTarget, type) },
{ MATROSKA_ID_TAGTARGETS_TYPEVALUE, EBML_UINT, 0, offsetof(MatroskaTagTarget,typevalue), {.u=50} }, { MATROSKA_ID_TAGTARGETS_TYPEVALUE, EBML_UINT, 0, offsetof(MatroskaTagTarget, typevalue), { .u = 50 } },
{ MATROSKA_ID_TAGTARGETS_TRACKUID, EBML_UINT, 0, offsetof(MatroskaTagTarget,trackuid) }, { MATROSKA_ID_TAGTARGETS_TRACKUID, EBML_UINT, 0, offsetof(MatroskaTagTarget, trackuid) },
{ MATROSKA_ID_TAGTARGETS_CHAPTERUID,EBML_UINT, 0, offsetof(MatroskaTagTarget,chapteruid) }, { MATROSKA_ID_TAGTARGETS_CHAPTERUID, EBML_UINT, 0, offsetof(MatroskaTagTarget, chapteruid) },
{ MATROSKA_ID_TAGTARGETS_ATTACHUID, EBML_UINT, 0, offsetof(MatroskaTagTarget,attachuid) }, { MATROSKA_ID_TAGTARGETS_ATTACHUID, EBML_UINT, 0, offsetof(MatroskaTagTarget, attachuid) },
{ 0 } { 0 }
}; };
static EbmlSyntax matroska_tag[] = { static EbmlSyntax matroska_tag[] = {
{ MATROSKA_ID_SIMPLETAG, EBML_NEST, sizeof(MatroskaTag), offsetof(MatroskaTags,tag), {.n=matroska_simpletag} }, { MATROSKA_ID_SIMPLETAG, EBML_NEST, sizeof(MatroskaTag), offsetof(MatroskaTags, tag), { .n = matroska_simpletag } },
{ MATROSKA_ID_TAGTARGETS, EBML_NEST, 0, offsetof(MatroskaTags,target), {.n=matroska_tagtargets} }, { MATROSKA_ID_TAGTARGETS, EBML_NEST, 0, offsetof(MatroskaTags, target), { .n = matroska_tagtargets } },
{ 0 } { 0 }
}; };
static EbmlSyntax matroska_tags[] = { static EbmlSyntax matroska_tags[] = {
{ MATROSKA_ID_TAG, EBML_NEST, sizeof(MatroskaTags), offsetof(MatroskaDemuxContext,tags), {.n=matroska_tag} }, { MATROSKA_ID_TAG, EBML_NEST, sizeof(MatroskaTags), offsetof(MatroskaDemuxContext, tags), { .n = matroska_tag } },
{ 0 } { 0 }
}; };
static EbmlSyntax matroska_seekhead_entry[] = { static EbmlSyntax matroska_seekhead_entry[] = {
{ MATROSKA_ID_SEEKID, EBML_UINT, 0, offsetof(MatroskaSeekhead,id) }, { MATROSKA_ID_SEEKID, EBML_UINT, 0, offsetof(MatroskaSeekhead, id) },
{ MATROSKA_ID_SEEKPOSITION, EBML_UINT, 0, offsetof(MatroskaSeekhead,pos), {.u=-1} }, { MATROSKA_ID_SEEKPOSITION, EBML_UINT, 0, offsetof(MatroskaSeekhead, pos), { .u = -1 } },
{ 0 } { 0 }
}; };
static EbmlSyntax matroska_seekhead[] = { static EbmlSyntax matroska_seekhead[] = {
{ MATROSKA_ID_SEEKENTRY, EBML_NEST, sizeof(MatroskaSeekhead), offsetof(MatroskaDemuxContext,seekhead), {.n=matroska_seekhead_entry} }, { MATROSKA_ID_SEEKENTRY, EBML_NEST, sizeof(MatroskaSeekhead), offsetof(MatroskaDemuxContext, seekhead), { .n = matroska_seekhead_entry } },
{ 0 } { 0 }
}; };
static EbmlSyntax matroska_segment[] = { static EbmlSyntax matroska_segment[] = {
{ MATROSKA_ID_INFO, EBML_NEST, 0, 0, {.n=matroska_info } }, { MATROSKA_ID_INFO, EBML_NEST, 0, 0, { .n = matroska_info } },
{ MATROSKA_ID_TRACKS, EBML_NEST, 0, 0, {.n=matroska_tracks } }, { MATROSKA_ID_TRACKS, EBML_NEST, 0, 0, { .n = matroska_tracks } },
{ MATROSKA_ID_ATTACHMENTS, EBML_NEST, 0, 0, {.n=matroska_attachments} }, { MATROSKA_ID_ATTACHMENTS, EBML_NEST, 0, 0, { .n = matroska_attachments } },
{ MATROSKA_ID_CHAPTERS, EBML_NEST, 0, 0, {.n=matroska_chapters } }, { MATROSKA_ID_CHAPTERS, EBML_NEST, 0, 0, { .n = matroska_chapters } },
{ MATROSKA_ID_CUES, EBML_NEST, 0, 0, {.n=matroska_index } }, { MATROSKA_ID_CUES, EBML_NEST, 0, 0, { .n = matroska_index } },
{ MATROSKA_ID_TAGS, EBML_NEST, 0, 0, {.n=matroska_tags } }, { MATROSKA_ID_TAGS, EBML_NEST, 0, 0, { .n = matroska_tags } },
{ MATROSKA_ID_SEEKHEAD, EBML_NEST, 0, 0, {.n=matroska_seekhead } }, { MATROSKA_ID_SEEKHEAD, EBML_NEST, 0, 0, { .n = matroska_seekhead } },
{ MATROSKA_ID_CLUSTER, EBML_STOP }, { MATROSKA_ID_CLUSTER, EBML_STOP },
{ 0 } { 0 }
}; };
static EbmlSyntax matroska_segments[] = { static EbmlSyntax matroska_segments[] = {
{ MATROSKA_ID_SEGMENT, EBML_NEST, 0, 0, {.n=matroska_segment } }, { MATROSKA_ID_SEGMENT, EBML_NEST, 0, 0, { .n = matroska_segment } },
{ 0 } { 0 }
}; };
static EbmlSyntax matroska_blockgroup[] = { static EbmlSyntax matroska_blockgroup[] = {
{ MATROSKA_ID_BLOCK, EBML_BIN, 0, offsetof(MatroskaBlock,bin) }, { MATROSKA_ID_BLOCK, EBML_BIN, 0, offsetof(MatroskaBlock, bin) },
{ MATROSKA_ID_SIMPLEBLOCK, EBML_BIN, 0, offsetof(MatroskaBlock,bin) }, { MATROSKA_ID_SIMPLEBLOCK, EBML_BIN, 0, offsetof(MatroskaBlock, bin) },
{ MATROSKA_ID_BLOCKDURATION, EBML_UINT, 0, offsetof(MatroskaBlock,duration), {.u=AV_NOPTS_VALUE} }, { MATROSKA_ID_BLOCKDURATION, EBML_UINT, 0, offsetof(MatroskaBlock, duration), { .u = AV_NOPTS_VALUE } },
{ MATROSKA_ID_BLOCKREFERENCE, EBML_UINT, 0, offsetof(MatroskaBlock,reference) }, { MATROSKA_ID_BLOCKREFERENCE, EBML_UINT, 0, offsetof(MatroskaBlock, reference) },
{ MATROSKA_ID_CODECSTATE, EBML_NONE }, { MATROSKA_ID_CODECSTATE, EBML_NONE },
{ 1, EBML_UINT, 0, offsetof(MatroskaBlock,non_simple), {.u=1} }, { 1, EBML_UINT, 0, offsetof(MatroskaBlock, non_simple), { .u = 1 } },
{ 0 } { 0 }
}; };
static EbmlSyntax matroska_cluster[] = { static EbmlSyntax matroska_cluster[] = {
{ MATROSKA_ID_CLUSTERTIMECODE,EBML_UINT,0, offsetof(MatroskaCluster,timecode) }, { MATROSKA_ID_CLUSTERTIMECODE, EBML_UINT, 0, offsetof(MatroskaCluster, timecode) },
{ MATROSKA_ID_BLOCKGROUP, EBML_NEST, sizeof(MatroskaBlock), offsetof(MatroskaCluster,blocks), {.n=matroska_blockgroup} }, { MATROSKA_ID_BLOCKGROUP, EBML_NEST, sizeof(MatroskaBlock), offsetof(MatroskaCluster, blocks), { .n = matroska_blockgroup } },
{ MATROSKA_ID_SIMPLEBLOCK, EBML_PASS, sizeof(MatroskaBlock), offsetof(MatroskaCluster,blocks), {.n=matroska_blockgroup} }, { MATROSKA_ID_SIMPLEBLOCK, EBML_PASS, sizeof(MatroskaBlock), offsetof(MatroskaCluster, blocks), { .n = matroska_blockgroup } },
{ MATROSKA_ID_CLUSTERPOSITION,EBML_NONE }, { MATROSKA_ID_CLUSTERPOSITION, EBML_NONE },
{ MATROSKA_ID_CLUSTERPREVSIZE,EBML_NONE }, { MATROSKA_ID_CLUSTERPREVSIZE, EBML_NONE },
{ 0 } { 0 }
}; };
static EbmlSyntax matroska_clusters[] = { static EbmlSyntax matroska_clusters[] = {
{ MATROSKA_ID_CLUSTER, EBML_NEST, 0, 0, {.n=matroska_cluster} }, { MATROSKA_ID_CLUSTER, EBML_NEST, 0, 0, { .n = matroska_cluster } },
{ MATROSKA_ID_INFO, EBML_NONE }, { MATROSKA_ID_INFO, EBML_NONE },
{ MATROSKA_ID_CUES, EBML_NONE }, { MATROSKA_ID_CUES, EBML_NONE },
{ MATROSKA_ID_TAGS, EBML_NONE }, { MATROSKA_ID_TAGS, EBML_NONE },
...@@ -524,11 +529,11 @@ static EbmlSyntax matroska_clusters[] = { ...@@ -524,11 +529,11 @@ static EbmlSyntax matroska_clusters[] = {
}; };
static EbmlSyntax matroska_cluster_incremental_parsing[] = { static EbmlSyntax matroska_cluster_incremental_parsing[] = {
{ MATROSKA_ID_CLUSTERTIMECODE,EBML_UINT,0, offsetof(MatroskaCluster,timecode) }, { MATROSKA_ID_CLUSTERTIMECODE, EBML_UINT, 0, offsetof(MatroskaCluster, timecode) },
{ MATROSKA_ID_BLOCKGROUP, EBML_NEST, sizeof(MatroskaBlock), offsetof(MatroskaCluster,blocks), {.n=matroska_blockgroup} }, { MATROSKA_ID_BLOCKGROUP, EBML_NEST, sizeof(MatroskaBlock), offsetof(MatroskaCluster, blocks), { .n = matroska_blockgroup } },
{ MATROSKA_ID_SIMPLEBLOCK, EBML_PASS, sizeof(MatroskaBlock), offsetof(MatroskaCluster,blocks), {.n=matroska_blockgroup} }, { MATROSKA_ID_SIMPLEBLOCK, EBML_PASS, sizeof(MatroskaBlock), offsetof(MatroskaCluster, blocks), { .n = matroska_blockgroup } },
{ MATROSKA_ID_CLUSTERPOSITION,EBML_NONE }, { MATROSKA_ID_CLUSTERPOSITION, EBML_NONE },
{ MATROSKA_ID_CLUSTERPREVSIZE,EBML_NONE }, { MATROSKA_ID_CLUSTERPREVSIZE, EBML_NONE },
{ MATROSKA_ID_INFO, EBML_NONE }, { MATROSKA_ID_INFO, EBML_NONE },
{ MATROSKA_ID_CUES, EBML_NONE }, { MATROSKA_ID_CUES, EBML_NONE },
{ MATROSKA_ID_TAGS, EBML_NONE }, { MATROSKA_ID_TAGS, EBML_NONE },
...@@ -538,16 +543,16 @@ static EbmlSyntax matroska_cluster_incremental_parsing[] = { ...@@ -538,16 +543,16 @@ static EbmlSyntax matroska_cluster_incremental_parsing[] = {
}; };
static EbmlSyntax matroska_cluster_incremental[] = { static EbmlSyntax matroska_cluster_incremental[] = {
{ MATROSKA_ID_CLUSTERTIMECODE,EBML_UINT,0, offsetof(MatroskaCluster,timecode) }, { MATROSKA_ID_CLUSTERTIMECODE, EBML_UINT, 0, offsetof(MatroskaCluster, timecode) },
{ MATROSKA_ID_BLOCKGROUP, EBML_STOP }, { MATROSKA_ID_BLOCKGROUP, EBML_STOP },
{ MATROSKA_ID_SIMPLEBLOCK, EBML_STOP }, { MATROSKA_ID_SIMPLEBLOCK, EBML_STOP },
{ MATROSKA_ID_CLUSTERPOSITION,EBML_NONE }, { MATROSKA_ID_CLUSTERPOSITION, EBML_NONE },
{ MATROSKA_ID_CLUSTERPREVSIZE,EBML_NONE }, { MATROSKA_ID_CLUSTERPREVSIZE, EBML_NONE },
{ 0 } { 0 }
}; };
static EbmlSyntax matroska_clusters_incremental[] = { static EbmlSyntax matroska_clusters_incremental[] = {
{ MATROSKA_ID_CLUSTER, EBML_NEST, 0, 0, {.n=matroska_cluster_incremental} }, { MATROSKA_ID_CLUSTER, EBML_NEST, 0, 0, { .n = matroska_cluster_incremental } },
{ MATROSKA_ID_INFO, EBML_NONE }, { MATROSKA_ID_INFO, EBML_NONE },
{ MATROSKA_ID_CUES, EBML_NONE }, { MATROSKA_ID_CUES, EBML_NONE },
{ MATROSKA_ID_TAGS, EBML_NONE }, { MATROSKA_ID_TAGS, EBML_NONE },
...@@ -581,6 +586,7 @@ static int matroska_resync(MatroskaDemuxContext *matroska, int64_t last_pos) ...@@ -581,6 +586,7 @@ static int matroska_resync(MatroskaDemuxContext *matroska, int64_t last_pos)
} }
id = (id << 8) | avio_r8(pb); id = (id << 8) | avio_r8(pb);
} }
eof: eof:
matroska->done = 1; matroska->done = 1;
return AVERROR_EOF; return AVERROR_EOF;
...@@ -692,13 +698,13 @@ static int ebml_read_uint(AVIOContext *pb, int size, uint64_t *num) ...@@ -692,13 +698,13 @@ static int ebml_read_uint(AVIOContext *pb, int size, uint64_t *num)
*/ */
static int ebml_read_float(AVIOContext *pb, int size, double *num) static int ebml_read_float(AVIOContext *pb, int size, double *num)
{ {
if (size == 0) { if (size == 0)
*num = 0; *num = 0;
} else if (size == 4) { else if (size == 4)
*num = av_int2float(avio_rb32(pb)); *num = av_int2float(avio_rb32(pb));
} else if (size == 8){ else if (size == 8)
*num = av_int2double(avio_rb64(pb)); *num = av_int2double(avio_rb64(pb));
} else else
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
return 0; return 0;
...@@ -798,7 +804,7 @@ static int matroska_ebmlnum_sint(MatroskaDemuxContext *matroska, ...@@ -798,7 +804,7 @@ static int matroska_ebmlnum_sint(MatroskaDemuxContext *matroska,
return res; return res;
/* make signed (weird way) */ /* make signed (weird way) */
*num = unum - ((1LL << (7*res - 1)) - 1); *num = unum - ((1LL << (7 * res - 1)) - 1);
return res; return res;
} }
...@@ -810,12 +816,12 @@ static int ebml_parse_id(MatroskaDemuxContext *matroska, EbmlSyntax *syntax, ...@@ -810,12 +816,12 @@ static int ebml_parse_id(MatroskaDemuxContext *matroska, EbmlSyntax *syntax,
uint32_t id, void *data) uint32_t id, void *data)
{ {
int i; int i;
for (i=0; syntax[i].id; i++) for (i = 0; syntax[i].id; i++)
if (id == syntax[i].id) if (id == syntax[i].id)
break; break;
if (!syntax[i].id && id == MATROSKA_ID_CLUSTER && if (!syntax[i].id && id == MATROSKA_ID_CLUSTER &&
matroska->num_levels > 0 && matroska->num_levels > 0 &&
matroska->levels[matroska->num_levels-1].length == 0xffffffffffffff) matroska->levels[matroska->num_levels - 1].length == 0xffffffffffffff)
return 0; // we reached the end of an unknown size cluster return 0; // we reached the end of an unknown size cluster
if (!syntax[i].id && id != EBML_ID_VOID && id != EBML_ID_CRC32) { if (!syntax[i].id && id != EBML_ID_VOID && id != EBML_ID_CRC32) {
av_log(matroska->ctx, AV_LOG_INFO, "Unknown entry 0x%X\n", id); av_log(matroska->ctx, AV_LOG_INFO, "Unknown entry 0x%X\n", id);
...@@ -833,7 +839,7 @@ static int ebml_parse(MatroskaDemuxContext *matroska, EbmlSyntax *syntax, ...@@ -833,7 +839,7 @@ static int ebml_parse(MatroskaDemuxContext *matroska, EbmlSyntax *syntax,
int res = ebml_read_num(matroska, matroska->ctx->pb, 4, &id); int res = ebml_read_num(matroska, matroska->ctx->pb, 4, &id);
if (res < 0) if (res < 0)
return res; return res;
matroska->current_id = id | 1 << 7*res; matroska->current_id = id | 1 << 7 * res;
} }
return ebml_parse_id(matroska, syntax, matroska->current_id, data); return ebml_parse_id(matroska, syntax, matroska->current_id, data);
} }
...@@ -843,19 +849,19 @@ static int ebml_parse_nest(MatroskaDemuxContext *matroska, EbmlSyntax *syntax, ...@@ -843,19 +849,19 @@ static int ebml_parse_nest(MatroskaDemuxContext *matroska, EbmlSyntax *syntax,
{ {
int i, res = 0; int i, res = 0;
for (i=0; syntax[i].id; i++) for (i = 0; syntax[i].id; i++)
switch (syntax[i].type) { switch (syntax[i].type) {
case EBML_UINT: case EBML_UINT:
*(uint64_t *)((char *)data+syntax[i].data_offset) = syntax[i].def.u; *(uint64_t *) ((char *) data + syntax[i].data_offset) = syntax[i].def.u;
break; break;
case EBML_FLOAT: case EBML_FLOAT:
*(double *)((char *)data+syntax[i].data_offset) = syntax[i].def.f; *(double *) ((char *) data + syntax[i].data_offset) = syntax[i].def.f;
break; break;
case EBML_STR: case EBML_STR:
case EBML_UTF8: case EBML_UTF8:
// the default may be NULL // the default may be NULL
if (syntax[i].def.s) { if (syntax[i].def.s) {
uint8_t **dst = (uint8_t**)((uint8_t*)data + syntax[i].data_offset); uint8_t **dst = (uint8_t **) ((uint8_t *) data + syntax[i].data_offset);
*dst = av_strdup(syntax[i].def.s); *dst = av_strdup(syntax[i].def.s);
if (!*dst) if (!*dst)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
...@@ -887,7 +893,7 @@ static int ebml_parse_elem(MatroskaDemuxContext *matroska, ...@@ -887,7 +893,7 @@ static int ebml_parse_elem(MatroskaDemuxContext *matroska,
uint64_t length; uint64_t length;
int res; int res;
data = (char *)data + syntax->data_offset; data = (char *) data + syntax->data_offset;
if (syntax->list_elem_size) { if (syntax->list_elem_size) {
EbmlList *list = data; EbmlList *list = data;
if ((res = av_reallocp_array(&list->elem, if ((res = av_reallocp_array(&list->elem,
...@@ -896,7 +902,7 @@ static int ebml_parse_elem(MatroskaDemuxContext *matroska, ...@@ -896,7 +902,7 @@ static int ebml_parse_elem(MatroskaDemuxContext *matroska,
list->nb_elem = 0; list->nb_elem = 0;
return res; return res;
} }
data = (char*)list->elem + list->nb_elem*syntax->list_elem_size; data = (char *) list->elem + list->nb_elem * syntax->list_elem_size;
memset(data, 0, syntax->list_elem_size); memset(data, 0, syntax->list_elem_size);
list->nb_elem++; list->nb_elem++;
} }
...@@ -914,19 +920,31 @@ static int ebml_parse_elem(MatroskaDemuxContext *matroska, ...@@ -914,19 +920,31 @@ static int ebml_parse_elem(MatroskaDemuxContext *matroska,
} }
switch (syntax->type) { switch (syntax->type) {
case EBML_UINT: res = ebml_read_uint (pb, length, data); break; case EBML_UINT:
case EBML_FLOAT: res = ebml_read_float (pb, length, data); break; res = ebml_read_uint(pb, length, data);
break;
case EBML_FLOAT:
res = ebml_read_float(pb, length, data);
break;
case EBML_STR: case EBML_STR:
case EBML_UTF8: res = ebml_read_ascii (pb, length, data); break; case EBML_UTF8:
case EBML_BIN: res = ebml_read_binary(pb, length, data); break; res = ebml_read_ascii(pb, length, data);
case EBML_NEST: if ((res=ebml_read_master(matroska, length)) < 0) break;
case EBML_BIN:
res = ebml_read_binary(pb, length, data);
break;
case EBML_NEST:
if ((res = ebml_read_master(matroska, length)) < 0)
return res; return res;
if (id == MATROSKA_ID_SEGMENT) if (id == MATROSKA_ID_SEGMENT)
matroska->segment_start = avio_tell(matroska->ctx->pb); matroska->segment_start = avio_tell(matroska->ctx->pb);
return ebml_parse_nest(matroska, syntax->def.n, data); return ebml_parse_nest(matroska, syntax->def.n, data);
case EBML_PASS: return ebml_parse_id(matroska, syntax->def.n, id, data); case EBML_PASS:
case EBML_STOP: return 1; return ebml_parse_id(matroska, syntax->def.n, id, data);
default: return avio_skip(pb,length)<0 ? AVERROR(EIO) : 0; case EBML_STOP:
return 1;
default:
return avio_skip(pb, length) < 0 ? AVERROR(EIO) : 0;
} }
if (res == AVERROR_INVALIDDATA) if (res == AVERROR_INVALIDDATA)
av_log(matroska->ctx, AV_LOG_ERROR, "Invalid element\n"); av_log(matroska->ctx, AV_LOG_ERROR, "Invalid element\n");
...@@ -938,27 +956,32 @@ static int ebml_parse_elem(MatroskaDemuxContext *matroska, ...@@ -938,27 +956,32 @@ static int ebml_parse_elem(MatroskaDemuxContext *matroska,
static void ebml_free(EbmlSyntax *syntax, void *data) static void ebml_free(EbmlSyntax *syntax, void *data)
{ {
int i, j; int i, j;
for (i=0; syntax[i].id; i++) { for (i = 0; syntax[i].id; i++) {
void *data_off = (char *)data + syntax[i].data_offset; void *data_off = (char *) data + syntax[i].data_offset;
switch (syntax[i].type) { switch (syntax[i].type) {
case EBML_STR: case EBML_STR:
case EBML_UTF8: av_freep(data_off); break; case EBML_UTF8:
case EBML_BIN: av_freep(&((EbmlBin *)data_off)->data); break; av_freep(data_off);
break;
case EBML_BIN:
av_freep(&((EbmlBin *) data_off)->data);
break;
case EBML_NEST: case EBML_NEST:
if (syntax[i].list_elem_size) { if (syntax[i].list_elem_size) {
EbmlList *list = data_off; EbmlList *list = data_off;
char *ptr = list->elem; char *ptr = list->elem;
for (j=0; j<list->nb_elem; j++, ptr+=syntax[i].list_elem_size) for (j = 0; j < list->nb_elem;
j++, ptr += syntax[i].list_elem_size)
ebml_free(syntax[i].def.n, ptr); ebml_free(syntax[i].def.n, ptr);
av_free(list->elem); av_free(list->elem);
} else } else
ebml_free(syntax[i].def.n, data_off); ebml_free(syntax[i].def.n, data_off);
default: break; default:
break;
} }
} }
} }
/* /*
* Autodetecting... * Autodetecting...
*/ */
...@@ -995,8 +1018,8 @@ static int matroska_probe(AVProbeData *p) ...@@ -995,8 +1018,8 @@ static int matroska_probe(AVProbeData *p)
int probelen = strlen(matroska_doctypes[i]); int probelen = strlen(matroska_doctypes[i]);
if (total < probelen) if (total < probelen)
continue; continue;
for (n = 4+size; n <= 4+size+total-probelen; n++) for (n = 4 + size; n <= 4 + size + total - probelen; n++)
if (!memcmp(p->buf+n, matroska_doctypes[i], probelen)) if (!memcmp(p->buf + n, matroska_doctypes[i], probelen))
return AVPROBE_SCORE_MAX; return AVPROBE_SCORE_MAX;
} }
...@@ -1010,7 +1033,7 @@ static MatroskaTrack *matroska_find_track_by_num(MatroskaDemuxContext *matroska, ...@@ -1010,7 +1033,7 @@ static MatroskaTrack *matroska_find_track_by_num(MatroskaDemuxContext *matroska,
MatroskaTrack *tracks = matroska->tracks.elem; MatroskaTrack *tracks = matroska->tracks.elem;
int i; int i;
for (i=0; i < matroska->tracks.nb_elem; i++) for (i = 0; i < matroska->tracks.nb_elem; i++)
if (tracks[i].num == num) if (tracks[i].num == num)
return &tracks[i]; return &tracks[i];
...@@ -1018,13 +1041,13 @@ static MatroskaTrack *matroska_find_track_by_num(MatroskaDemuxContext *matroska, ...@@ -1018,13 +1041,13 @@ static MatroskaTrack *matroska_find_track_by_num(MatroskaDemuxContext *matroska,
return NULL; return NULL;
} }
static int matroska_decode_buffer(uint8_t** buf, int* buf_size, static int matroska_decode_buffer(uint8_t **buf, int *buf_size,
MatroskaTrack *track) MatroskaTrack *track)
{ {
MatroskaTrackEncoding *encodings = track->encodings.elem; MatroskaTrackEncoding *encodings = track->encodings.elem;
uint8_t* data = *buf; uint8_t *data = *buf;
int isize = *buf_size; int isize = *buf_size;
uint8_t* pkt_data = NULL; uint8_t *pkt_data = NULL;
uint8_t av_unused *newpktdata; uint8_t av_unused *newpktdata;
int pkt_size = isize; int pkt_size = isize;
int result = 0; int result = 0;
...@@ -1034,7 +1057,8 @@ static int matroska_decode_buffer(uint8_t** buf, int* buf_size, ...@@ -1034,7 +1057,8 @@ static int matroska_decode_buffer(uint8_t** buf, int* buf_size,
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
switch (encodings[0].compression.algo) { switch (encodings[0].compression.algo) {
case MATROSKA_TRACK_ENCODING_COMP_HEADERSTRIP: { case MATROSKA_TRACK_ENCODING_COMP_HEADERSTRIP:
{
int header_size = encodings[0].compression.settings.size; int header_size = encodings[0].compression.settings.size;
uint8_t *header = encodings[0].compression.settings.data; uint8_t *header = encodings[0].compression.settings.data;
...@@ -1061,7 +1085,7 @@ static int matroska_decode_buffer(uint8_t** buf, int* buf_size, ...@@ -1061,7 +1085,7 @@ static int matroska_decode_buffer(uint8_t** buf, int* buf_size,
} }
pkt_data = newpktdata; pkt_data = newpktdata;
result = av_lzo1x_decode(pkt_data, &olen, data, &isize); result = av_lzo1x_decode(pkt_data, &olen, data, &isize);
} while (result==AV_LZO_OUTPUT_FULL && pkt_size<10000000); } while (result == AV_LZO_OUTPUT_FULL && pkt_size < 10000000);
if (result) { if (result) {
result = AVERROR_INVALIDDATA; result = AVERROR_INVALIDDATA;
goto failed; goto failed;
...@@ -1070,8 +1094,9 @@ static int matroska_decode_buffer(uint8_t** buf, int* buf_size, ...@@ -1070,8 +1094,9 @@ static int matroska_decode_buffer(uint8_t** buf, int* buf_size,
break; break;
#endif #endif
#if CONFIG_ZLIB #if CONFIG_ZLIB
case MATROSKA_TRACK_ENCODING_COMP_ZLIB: { case MATROSKA_TRACK_ENCODING_COMP_ZLIB:
z_stream zstream = {0}; {
z_stream zstream = { 0 };
if (inflateInit(&zstream) != Z_OK) if (inflateInit(&zstream) != Z_OK)
return -1; return -1;
zstream.next_in = data; zstream.next_in = data;
...@@ -1087,7 +1112,7 @@ static int matroska_decode_buffer(uint8_t** buf, int* buf_size, ...@@ -1087,7 +1112,7 @@ static int matroska_decode_buffer(uint8_t** buf, int* buf_size,
zstream.avail_out = pkt_size - zstream.total_out; zstream.avail_out = pkt_size - zstream.total_out;
zstream.next_out = pkt_data + zstream.total_out; zstream.next_out = pkt_data + zstream.total_out;
result = inflate(&zstream, Z_NO_FLUSH); result = inflate(&zstream, Z_NO_FLUSH);
} while (result==Z_OK && pkt_size<10000000); } while (result == Z_OK && pkt_size < 10000000);
pkt_size = zstream.total_out; pkt_size = zstream.total_out;
inflateEnd(&zstream); inflateEnd(&zstream);
if (result != Z_STREAM_END) { if (result != Z_STREAM_END) {
...@@ -1101,8 +1126,9 @@ static int matroska_decode_buffer(uint8_t** buf, int* buf_size, ...@@ -1101,8 +1126,9 @@ static int matroska_decode_buffer(uint8_t** buf, int* buf_size,
} }
#endif #endif
#if CONFIG_BZLIB #if CONFIG_BZLIB
case MATROSKA_TRACK_ENCODING_COMP_BZLIB: { case MATROSKA_TRACK_ENCODING_COMP_BZLIB:
bz_stream bzstream = {0}; {
bz_stream bzstream = { 0 };
if (BZ2_bzDecompressInit(&bzstream, 0, 0) != BZ_OK) if (BZ2_bzDecompressInit(&bzstream, 0, 0) != BZ_OK)
return -1; return -1;
bzstream.next_in = data; bzstream.next_in = data;
...@@ -1118,7 +1144,7 @@ static int matroska_decode_buffer(uint8_t** buf, int* buf_size, ...@@ -1118,7 +1144,7 @@ static int matroska_decode_buffer(uint8_t** buf, int* buf_size,
bzstream.avail_out = pkt_size - bzstream.total_out_lo32; bzstream.avail_out = pkt_size - bzstream.total_out_lo32;
bzstream.next_out = pkt_data + bzstream.total_out_lo32; bzstream.next_out = pkt_data + bzstream.total_out_lo32;
result = BZ2_bzDecompress(&bzstream); result = BZ2_bzDecompress(&bzstream);
} while (result==BZ_OK && pkt_size<10000000); } while (result == BZ_OK && pkt_size < 10000000);
pkt_size = bzstream.total_out_lo32; pkt_size = bzstream.total_out_lo32;
BZ2_bzDecompressEnd(&bzstream); BZ2_bzDecompressEnd(&bzstream);
if (result != BZ_STREAM_END) { if (result != BZ_STREAM_END) {
...@@ -1138,7 +1164,8 @@ static int matroska_decode_buffer(uint8_t** buf, int* buf_size, ...@@ -1138,7 +1164,8 @@ static int matroska_decode_buffer(uint8_t** buf, int* buf_size,
*buf = pkt_data; *buf = pkt_data;
*buf_size = pkt_size; *buf_size = pkt_size;
return 0; return 0;
failed:
failed:
av_free(pkt_data); av_free(pkt_data);
return result; return result;
} }
...@@ -1147,27 +1174,37 @@ static void matroska_fix_ass_packet(MatroskaDemuxContext *matroska, ...@@ -1147,27 +1174,37 @@ static void matroska_fix_ass_packet(MatroskaDemuxContext *matroska,
AVPacket *pkt, uint64_t display_duration) AVPacket *pkt, uint64_t display_duration)
{ {
AVBufferRef *line; AVBufferRef *line;
char *layer, *ptr = pkt->data, *end = ptr+pkt->size; char *layer, *ptr = pkt->data, *end = ptr + pkt->size;
for (; *ptr!=',' && ptr<end-1; ptr++);
for (; *ptr != ',' && ptr < end - 1; ptr++)
;
if (*ptr == ',') if (*ptr == ',')
layer = ++ptr; layer = ++ptr;
for (; *ptr!=',' && ptr<end-1; ptr++); for (; *ptr != ',' && ptr < end - 1; ptr++)
;
if (*ptr == ',') { if (*ptr == ',') {
int64_t end_pts = pkt->pts + display_duration; int64_t end_pts = pkt->pts + display_duration;
int sc = matroska->time_scale * pkt->pts / 10000000; int sc = matroska->time_scale * pkt->pts / 10000000;
int ec = matroska->time_scale * end_pts / 10000000; int ec = matroska->time_scale * end_pts / 10000000;
int sh, sm, ss, eh, em, es, len; int sh, sm, ss, eh, em, es, len;
sh = sc/360000; sc -= 360000*sh; sh = sc / 360000;
sm = sc/ 6000; sc -= 6000*sm; sc -= 360000 * sh;
ss = sc/ 100; sc -= 100*ss; sm = sc / 6000;
eh = ec/360000; ec -= 360000*eh; sc -= 6000 * sm;
em = ec/ 6000; ec -= 6000*em; ss = sc / 100;
es = ec/ 100; ec -= 100*es; sc -= 100 * ss;
eh = ec / 360000;
ec -= 360000 * eh;
em = ec / 6000;
ec -= 6000 * em;
es = ec / 100;
ec -= 100 * es;
*ptr++ = '\0'; *ptr++ = '\0';
len = 50 + end-ptr + FF_INPUT_BUFFER_PADDING_SIZE; len = 50 + end - ptr + FF_INPUT_BUFFER_PADDING_SIZE;
if (!(line = av_buffer_alloc(len))) if (!(line = av_buffer_alloc(len)))
return; return;
snprintf(line->data, len,"Dialogue: %s,%d:%02d:%02d.%02d,%d:%02d:%02d.%02d,%s\r\n", snprintf(line->data, len,
"Dialogue: %s,%d:%02d:%02d.%02d,%d:%02d:%02d.%02d,%s\r\n",
layer, sh, sm, ss, sc, eh, em, es, ec, ptr); layer, sh, sm, ss, sc, eh, em, es, ec, ptr);
av_buffer_unref(&pkt->buf); av_buffer_unref(&pkt->buf);
pkt->buf = line; pkt->buf = line;
...@@ -1197,16 +1234,18 @@ static void matroska_convert_tag(AVFormatContext *s, EbmlList *list, ...@@ -1197,16 +1234,18 @@ static void matroska_convert_tag(AVFormatContext *s, EbmlList *list,
char key[1024]; char key[1024];
int i; int i;
for (i=0; i < list->nb_elem; i++) { for (i = 0; i < list->nb_elem; i++) {
const char *lang = tags[i].lang && strcmp(tags[i].lang, "und") ? const char *lang = tags[i].lang &&
tags[i].lang : NULL; strcmp(tags[i].lang, "und") ? tags[i].lang : NULL;
if (!tags[i].name) { if (!tags[i].name) {
av_log(s, AV_LOG_WARNING, "Skipping invalid tag with no TagName.\n"); av_log(s, AV_LOG_WARNING, "Skipping invalid tag with no TagName.\n");
continue; continue;
} }
if (prefix) snprintf(key, sizeof(key), "%s/%s", prefix, tags[i].name); if (prefix)
else av_strlcpy(key, tags[i].name, sizeof(key)); snprintf(key, sizeof(key), "%s/%s", prefix, tags[i].name);
else
av_strlcpy(key, tags[i].name, sizeof(key));
if (tags[i].def || !lang) { if (tags[i].def || !lang) {
av_dict_set(metadata, key, tags[i].string, 0); av_dict_set(metadata, key, tags[i].string, 0);
if (tags[i].sub.nb_elem) if (tags[i].sub.nb_elem)
...@@ -1229,24 +1268,24 @@ static void matroska_convert_tags(AVFormatContext *s) ...@@ -1229,24 +1268,24 @@ static void matroska_convert_tags(AVFormatContext *s)
MatroskaTags *tags = matroska->tags.elem; MatroskaTags *tags = matroska->tags.elem;
int i, j; int i, j;
for (i=0; i < matroska->tags.nb_elem; i++) { for (i = 0; i < matroska->tags.nb_elem; i++) {
if (tags[i].target.attachuid) { if (tags[i].target.attachuid) {
MatroskaAttachement *attachment = matroska->attachments.elem; MatroskaAttachement *attachment = matroska->attachments.elem;
for (j=0; j<matroska->attachments.nb_elem; j++) for (j = 0; j < matroska->attachments.nb_elem; j++)
if (attachment[j].uid == tags[i].target.attachuid if (attachment[j].uid == tags[i].target.attachuid &&
&& attachment[j].stream) attachment[j].stream)
matroska_convert_tag(s, &tags[i].tag, matroska_convert_tag(s, &tags[i].tag,
&attachment[j].stream->metadata, NULL); &attachment[j].stream->metadata, NULL);
} else if (tags[i].target.chapteruid) { } else if (tags[i].target.chapteruid) {
MatroskaChapter *chapter = matroska->chapters.elem; MatroskaChapter *chapter = matroska->chapters.elem;
for (j=0; j<matroska->chapters.nb_elem; j++) for (j = 0; j < matroska->chapters.nb_elem; j++)
if (chapter[j].uid == tags[i].target.chapteruid if (chapter[j].uid == tags[i].target.chapteruid &&
&& chapter[j].chapter) chapter[j].chapter)
matroska_convert_tag(s, &tags[i].tag, matroska_convert_tag(s, &tags[i].tag,
&chapter[j].chapter->metadata, NULL); &chapter[j].chapter->metadata, NULL);
} else if (tags[i].target.trackuid) { } else if (tags[i].target.trackuid) {
MatroskaTrack *track = matroska->tracks.elem; MatroskaTrack *track = matroska->tracks.elem;
for (j=0; j<matroska->tracks.nb_elem; j++) for (j = 0; j < matroska->tracks.nb_elem; j++)
if (track[j].uid == tags[i].target.trackuid && track[j].stream) if (track[j].uid == tags[i].target.trackuid && track[j].stream)
matroska_convert_tag(s, &tags[i].tag, matroska_convert_tag(s, &tags[i].tag,
&track[j].stream->metadata, NULL); &track[j].stream->metadata, NULL);
...@@ -1257,20 +1296,21 @@ static void matroska_convert_tags(AVFormatContext *s) ...@@ -1257,20 +1296,21 @@ static void matroska_convert_tags(AVFormatContext *s)
} }
} }
static int matroska_parse_seekhead_entry(MatroskaDemuxContext *matroska, int idx) static int matroska_parse_seekhead_entry(MatroskaDemuxContext *matroska,
int idx)
{ {
EbmlList *seekhead_list = &matroska->seekhead; EbmlList *seekhead_list = &matroska->seekhead;
MatroskaSeekhead *seekhead = seekhead_list->elem;
uint32_t level_up = matroska->level_up; uint32_t level_up = matroska->level_up;
int64_t before_pos = avio_tell(matroska->ctx->pb);
uint32_t saved_id = matroska->current_id; uint32_t saved_id = matroska->current_id;
MatroskaSeekhead *seekhead = seekhead_list->elem;
int64_t before_pos = avio_tell(matroska->ctx->pb);
MatroskaLevel level; MatroskaLevel level;
int64_t offset; int64_t offset;
int ret = 0; int ret = 0;
if (idx >= seekhead_list->nb_elem if (idx >= seekhead_list->nb_elem ||
|| seekhead[idx].id == MATROSKA_ID_SEEKHEAD seekhead[idx].id == MATROSKA_ID_SEEKHEAD ||
|| seekhead[idx].id == MATROSKA_ID_CLUSTER) seekhead[idx].id == MATROSKA_ID_CLUSTER)
return 0; return 0;
/* seek */ /* seek */
...@@ -1285,7 +1325,7 @@ static int matroska_parse_seekhead_entry(MatroskaDemuxContext *matroska, int idx ...@@ -1285,7 +1325,7 @@ static int matroska_parse_seekhead_entry(MatroskaDemuxContext *matroska, int idx
ret = AVERROR_INVALIDDATA; ret = AVERROR_INVALIDDATA;
} else { } else {
level.start = 0; level.start = 0;
level.length = (uint64_t)-1; level.length = (uint64_t) -1;
matroska->levels[matroska->num_levels] = level; matroska->levels[matroska->num_levels] = level;
matroska->num_levels++; matroska->num_levels++;
matroska->current_id = 0; matroska->current_id = 0;
...@@ -1295,7 +1335,7 @@ static int matroska_parse_seekhead_entry(MatroskaDemuxContext *matroska, int idx ...@@ -1295,7 +1335,7 @@ static int matroska_parse_seekhead_entry(MatroskaDemuxContext *matroska, int idx
/* remove dummy level */ /* remove dummy level */
while (matroska->num_levels) { while (matroska->num_levels) {
uint64_t length = matroska->levels[--matroska->num_levels].length; uint64_t length = matroska->levels[--matroska->num_levels].length;
if (length == (uint64_t)-1) if (length == (uint64_t) -1)
break; break;
} }
} }
...@@ -1335,7 +1375,8 @@ static void matroska_execute_seekhead(MatroskaDemuxContext *matroska) ...@@ -1335,7 +1375,8 @@ static void matroska_execute_seekhead(MatroskaDemuxContext *matroska)
} }
} }
static void matroska_parse_cues(MatroskaDemuxContext *matroska) { static void matroska_parse_cues(MatroskaDemuxContext *matroska)
{
EbmlList *seekhead_list = &matroska->seekhead; EbmlList *seekhead_list = &matroska->seekhead;
MatroskaSeekhead *seekhead = seekhead_list->elem; MatroskaSeekhead *seekhead = seekhead_list->elem;
EbmlList *index_list; EbmlList *index_list;
...@@ -1352,8 +1393,8 @@ static void matroska_parse_cues(MatroskaDemuxContext *matroska) { ...@@ -1352,8 +1393,8 @@ static void matroska_parse_cues(MatroskaDemuxContext *matroska) {
index_list = &matroska->index; index_list = &matroska->index;
index = index_list->elem; index = index_list->elem;
if (index_list->nb_elem if (index_list->nb_elem &&
&& index[0].time > 1E14/matroska->time_scale) { index[0].time > 1E14 / matroska->time_scale) {
av_log(matroska->ctx, AV_LOG_WARNING, "Working around broken index.\n"); av_log(matroska->ctx, AV_LOG_WARNING, "Working around broken index.\n");
index_scale = matroska->time_scale; index_scale = matroska->time_scale;
} }
...@@ -1361,11 +1402,12 @@ static void matroska_parse_cues(MatroskaDemuxContext *matroska) { ...@@ -1361,11 +1402,12 @@ static void matroska_parse_cues(MatroskaDemuxContext *matroska) {
EbmlList *pos_list = &index[i].pos; EbmlList *pos_list = &index[i].pos;
MatroskaIndexPos *pos = pos_list->elem; MatroskaIndexPos *pos = pos_list->elem;
for (j = 0; j < pos_list->nb_elem; j++) { for (j = 0; j < pos_list->nb_elem; j++) {
MatroskaTrack *track = matroska_find_track_by_num(matroska, pos[j].track); MatroskaTrack *track = matroska_find_track_by_num(matroska,
pos[j].track);
if (track && track->stream) if (track && track->stream)
av_add_index_entry(track->stream, av_add_index_entry(track->stream,
pos[j].pos + matroska->segment_start, pos[j].pos + matroska->segment_start,
index[i].time/index_scale, 0, 0, index[i].time / index_scale, 0, 0,
AVINDEX_KEYFRAME); AVINDEX_KEYFRAME);
} }
} }
...@@ -1373,10 +1415,10 @@ static void matroska_parse_cues(MatroskaDemuxContext *matroska) { ...@@ -1373,10 +1415,10 @@ static void matroska_parse_cues(MatroskaDemuxContext *matroska) {
static int matroska_aac_profile(char *codec_id) static int matroska_aac_profile(char *codec_id)
{ {
static const char * const aac_profiles[] = { "MAIN", "LC", "SSR" }; static const char *const aac_profiles[] = { "MAIN", "LC", "SSR" };
int profile; int profile;
for (profile=0; profile<FF_ARRAY_ELEMS(aac_profiles); profile++) for (profile = 0; profile < FF_ARRAY_ELEMS(aac_profiles); profile++)
if (strstr(codec_id, aac_profiles[profile])) if (strstr(codec_id, aac_profiles[profile]))
break; break;
return profile + 1; return profile + 1;
...@@ -1386,7 +1428,7 @@ static int matroska_aac_sri(int samplerate) ...@@ -1386,7 +1428,7 @@ static int matroska_aac_sri(int samplerate)
{ {
int sri; int sri;
for (sri=0; sri<FF_ARRAY_ELEMS(avpriv_mpeg4audio_sample_rates); sri++) for (sri = 0; sri < FF_ARRAY_ELEMS(avpriv_mpeg4audio_sample_rates); sri++)
if (avpriv_mpeg4audio_sample_rates[sri] == samplerate) if (avpriv_mpeg4audio_sample_rates[sri] == samplerate)
break; break;
return sri; return sri;
...@@ -1396,8 +1438,8 @@ static int matroska_read_header(AVFormatContext *s) ...@@ -1396,8 +1438,8 @@ static int matroska_read_header(AVFormatContext *s)
{ {
MatroskaDemuxContext *matroska = s->priv_data; MatroskaDemuxContext *matroska = s->priv_data;
EbmlList *attachements_list = &matroska->attachments; EbmlList *attachements_list = &matroska->attachments;
MatroskaAttachement *attachements;
EbmlList *chapters_list = &matroska->chapters; EbmlList *chapters_list = &matroska->chapters;
MatroskaAttachement *attachements;
MatroskaChapter *chapters; MatroskaChapter *chapters;
MatroskaTrack *tracks; MatroskaTrack *tracks;
uint64_t max_start = 0; uint64_t max_start = 0;
...@@ -1409,9 +1451,11 @@ static int matroska_read_header(AVFormatContext *s) ...@@ -1409,9 +1451,11 @@ static int matroska_read_header(AVFormatContext *s)
matroska->ctx = s; matroska->ctx = s;
/* First read the EBML header. */ /* First read the EBML header. */
if (ebml_parse(matroska, ebml_syntax, &ebml) if (ebml_parse(matroska, ebml_syntax, &ebml) ||
|| ebml.version > EBML_VERSION || ebml.max_size > sizeof(uint64_t) ebml.version > EBML_VERSION ||
|| ebml.id_length > sizeof(uint32_t) || ebml.doctype_version > 2) { ebml.max_size > sizeof(uint64_t) ||
ebml.id_length > sizeof(uint32_t) ||
ebml.doctype_version > 2) {
av_log(matroska->ctx, AV_LOG_ERROR, av_log(matroska->ctx, AV_LOG_ERROR,
"EBML header using unsupported features\n" "EBML header using unsupported features\n"
"(EBML version %"PRIu64", doctype %s, doc version %"PRIu64")\n", "(EBML version %"PRIu64", doctype %s, doc version %"PRIu64")\n",
...@@ -1447,12 +1491,12 @@ static int matroska_read_header(AVFormatContext *s) ...@@ -1447,12 +1491,12 @@ static int matroska_read_header(AVFormatContext *s)
if (!matroska->time_scale) if (!matroska->time_scale)
matroska->time_scale = 1000000; matroska->time_scale = 1000000;
if (matroska->duration) if (matroska->duration)
matroska->ctx->duration = matroska->duration * matroska->time_scale matroska->ctx->duration = matroska->duration * matroska->time_scale *
* 1000 / AV_TIME_BASE; 1000 / AV_TIME_BASE;
av_dict_set(&s->metadata, "title", matroska->title, 0); av_dict_set(&s->metadata, "title", matroska->title, 0);
tracks = matroska->tracks.elem; tracks = matroska->tracks.elem;
for (i=0; i < matroska->tracks.nb_elem; i++) { for (i = 0; i < matroska->tracks.nb_elem; i++) {
MatroskaTrack *track = &tracks[i]; MatroskaTrack *track = &tracks[i];
enum AVCodecID codec_id = AV_CODEC_ID_NONE; enum AVCodecID codec_id = AV_CODEC_ID_NONE;
EbmlList *encodings_list = &track->encodings; EbmlList *encodings_list = &track->encodings;
...@@ -1476,7 +1520,7 @@ static int matroska_read_header(AVFormatContext *s) ...@@ -1476,7 +1520,7 @@ static int matroska_read_header(AVFormatContext *s)
if (track->type == MATROSKA_TRACK_TYPE_VIDEO) { if (track->type == MATROSKA_TRACK_TYPE_VIDEO) {
if (!track->default_duration && track->video.frame_rate > 0) if (!track->default_duration && track->video.frame_rate > 0)
track->default_duration = 1000000000/track->video.frame_rate; track->default_duration = 1000000000 / track->video.frame_rate;
if (!track->video.display_width) if (!track->video.display_width)
track->video.display_width = track->video.pixel_width; track->video.display_width = track->video.pixel_width;
if (!track->video.display_height) if (!track->video.display_height)
...@@ -1504,7 +1548,7 @@ static int matroska_read_header(AVFormatContext *s) ...@@ -1504,7 +1548,7 @@ static int matroska_read_header(AVFormatContext *s)
encodings[0].scope = 0; encodings[0].scope = 0;
av_log(matroska->ctx, AV_LOG_ERROR, av_log(matroska->ctx, AV_LOG_ERROR,
"Unsupported encoding type"); "Unsupported encoding type");
} else if (track->codec_priv.size && encodings[0].scope&2) { } else if (track->codec_priv.size && encodings[0].scope & 2) {
uint8_t *codec_priv = track->codec_priv.data; uint8_t *codec_priv = track->codec_priv.data;
int ret = matroska_decode_buffer(&track->codec_priv.data, int ret = matroska_decode_buffer(&track->codec_priv.data,
&track->codec_priv.size, &track->codec_priv.size,
...@@ -1521,10 +1565,10 @@ static int matroska_read_header(AVFormatContext *s) ...@@ -1521,10 +1565,10 @@ static int matroska_read_header(AVFormatContext *s)
} }
} }
for(j=0; ff_mkv_codec_tags[j].id != AV_CODEC_ID_NONE; j++){ for (j = 0; ff_mkv_codec_tags[j].id != AV_CODEC_ID_NONE; j++) {
if(!strncmp(ff_mkv_codec_tags[j].str, track->codec_id, if (!strncmp(ff_mkv_codec_tags[j].str, track->codec_id,
strlen(ff_mkv_codec_tags[j].str))){ strlen(ff_mkv_codec_tags[j].str))) {
codec_id= ff_mkv_codec_tags[j].id; codec_id = ff_mkv_codec_tags[j].id;
break; break;
} }
} }
...@@ -1533,42 +1577,58 @@ static int matroska_read_header(AVFormatContext *s) ...@@ -1533,42 +1577,58 @@ static int matroska_read_header(AVFormatContext *s)
if (st == NULL) if (st == NULL)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
if (!strcmp(track->codec_id, "V_MS/VFW/FOURCC") if (!strcmp(track->codec_id, "V_MS/VFW/FOURCC") &&
&& track->codec_priv.size >= 40 track->codec_priv.size >= 40 &&
&& track->codec_priv.data != NULL) { track->codec_priv.data != NULL) {
track->ms_compat = 1; track->ms_compat = 1;
track->video.fourcc = AV_RL32(track->codec_priv.data + 16); track->video.fourcc = AV_RL32(track->codec_priv.data + 16);
codec_id = ff_codec_get_id(ff_codec_bmp_tags, track->video.fourcc); codec_id = ff_codec_get_id(ff_codec_bmp_tags,
track->video.fourcc);
extradata_offset = 40; extradata_offset = 40;
} else if (!strcmp(track->codec_id, "A_MS/ACM") } else if (!strcmp(track->codec_id, "A_MS/ACM") &&
&& track->codec_priv.size >= 14 track->codec_priv.size >= 14 &&
&& track->codec_priv.data != NULL) { track->codec_priv.data != NULL) {
int ret; int ret;
ffio_init_context(&b, track->codec_priv.data, track->codec_priv.size, ffio_init_context(&b, track->codec_priv.data,
track->codec_priv.size,
0, NULL, NULL, NULL, NULL); 0, NULL, NULL, NULL, NULL);
ret = ff_get_wav_header(&b, st->codec, track->codec_priv.size); ret = ff_get_wav_header(&b, st->codec, track->codec_priv.size);
if (ret < 0) if (ret < 0)
return ret; return ret;
codec_id = st->codec->codec_id; codec_id = st->codec->codec_id;
extradata_offset = FFMIN(track->codec_priv.size, 18); extradata_offset = FFMIN(track->codec_priv.size, 18);
} else if (!strcmp(track->codec_id, "V_QUICKTIME") } else if (!strcmp(track->codec_id, "V_QUICKTIME") &&
&& (track->codec_priv.size >= 86) (track->codec_priv.size >= 86) &&
&& (track->codec_priv.data != NULL)) { (track->codec_priv.data != NULL)) {
track->video.fourcc = AV_RL32(track->codec_priv.data); track->video.fourcc = AV_RL32(track->codec_priv.data);
codec_id=ff_codec_get_id(ff_codec_movvideo_tags, track->video.fourcc); codec_id = ff_codec_get_id(ff_codec_movvideo_tags,
track->video.fourcc);
} else if (codec_id == AV_CODEC_ID_PCM_S16BE) { } else if (codec_id == AV_CODEC_ID_PCM_S16BE) {
switch (track->audio.bitdepth) { switch (track->audio.bitdepth) {
case 8: codec_id = AV_CODEC_ID_PCM_U8; break; case 8:
case 24: codec_id = AV_CODEC_ID_PCM_S24BE; break; codec_id = AV_CODEC_ID_PCM_U8;
case 32: codec_id = AV_CODEC_ID_PCM_S32BE; break; break;
case 24:
codec_id = AV_CODEC_ID_PCM_S24BE;
break;
case 32:
codec_id = AV_CODEC_ID_PCM_S32BE;
break;
} }
} else if (codec_id == AV_CODEC_ID_PCM_S16LE) { } else if (codec_id == AV_CODEC_ID_PCM_S16LE) {
switch (track->audio.bitdepth) { switch (track->audio.bitdepth) {
case 8: codec_id = AV_CODEC_ID_PCM_U8; break; case 8:
case 24: codec_id = AV_CODEC_ID_PCM_S24LE; break; codec_id = AV_CODEC_ID_PCM_U8;
case 32: codec_id = AV_CODEC_ID_PCM_S32LE; break; break;
case 24:
codec_id = AV_CODEC_ID_PCM_S24LE;
break;
case 32:
codec_id = AV_CODEC_ID_PCM_S32LE;
break;
} }
} else if (codec_id==AV_CODEC_ID_PCM_F32LE && track->audio.bitdepth==64) { } else if (codec_id == AV_CODEC_ID_PCM_F32LE &&
track->audio.bitdepth == 64) {
codec_id = AV_CODEC_ID_PCM_F64LE; codec_id = AV_CODEC_ID_PCM_F64LE;
} else if (codec_id == AV_CODEC_ID_AAC && !track->codec_priv.size) { } else if (codec_id == AV_CODEC_ID_AAC && !track->codec_priv.size) {
int profile = matroska_aac_profile(track->codec_id); int profile = matroska_aac_profile(track->codec_id);
...@@ -1576,22 +1636,23 @@ static int matroska_read_header(AVFormatContext *s) ...@@ -1576,22 +1636,23 @@ static int matroska_read_header(AVFormatContext *s)
extradata = av_mallocz(5 + FF_INPUT_BUFFER_PADDING_SIZE); extradata = av_mallocz(5 + FF_INPUT_BUFFER_PADDING_SIZE);
if (extradata == NULL) if (extradata == NULL)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
extradata[0] = (profile << 3) | ((sri&0x0E) >> 1); extradata[0] = (profile << 3) | ((sri & 0x0E) >> 1);
extradata[1] = ((sri&0x01) << 7) | (track->audio.channels<<3); extradata[1] = ((sri & 0x01) << 7) | (track->audio.channels << 3);
if (strstr(track->codec_id, "SBR")) { if (strstr(track->codec_id, "SBR")) {
sri = matroska_aac_sri(track->audio.out_samplerate); sri = matroska_aac_sri(track->audio.out_samplerate);
extradata[2] = 0x56; extradata[2] = 0x56;
extradata[3] = 0xE5; extradata[3] = 0xE5;
extradata[4] = 0x80 | (sri<<3); extradata[4] = 0x80 | (sri << 3);
extradata_size = 5; extradata_size = 5;
} else } else
extradata_size = 2; extradata_size = 2;
} else if (codec_id == AV_CODEC_ID_ALAC && track->codec_priv.size) { } else if (codec_id == AV_CODEC_ID_ALAC && track->codec_priv.size) {
/* Only ALAC's magic cookie is stored in Matroska's track headers. /* Only ALAC's magic cookie is stored in Matroska's track headers.
Create the "atom size", "tag", and "tag version" fields the * Create the "atom size", "tag", and "tag version" fields the
decoder expects manually. */ * decoder expects manually. */
extradata_size = 12 + track->codec_priv.size; extradata_size = 12 + track->codec_priv.size;
extradata = av_mallocz(extradata_size + FF_INPUT_BUFFER_PADDING_SIZE); extradata = av_mallocz(extradata_size +
FF_INPUT_BUFFER_PADDING_SIZE);
if (extradata == NULL) if (extradata == NULL)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
AV_WB32(extradata, extradata_size); AV_WB32(extradata, extradata_size);
...@@ -1611,17 +1672,23 @@ static int matroska_read_header(AVFormatContext *s) ...@@ -1611,17 +1672,23 @@ static int matroska_read_header(AVFormatContext *s)
avio_wl16(&b, track->audio.channels); avio_wl16(&b, track->audio.channels);
avio_wl16(&b, track->audio.bitdepth); avio_wl16(&b, track->audio.bitdepth);
avio_wl32(&b, track->audio.out_samplerate); avio_wl32(&b, track->audio.out_samplerate);
avio_wl32(&b, matroska->ctx->duration * track->audio.out_samplerate); avio_wl32(&b, matroska->ctx->duration *
} else if (codec_id == AV_CODEC_ID_RV10 || codec_id == AV_CODEC_ID_RV20 || track->audio.out_samplerate);
codec_id == AV_CODEC_ID_RV30 || codec_id == AV_CODEC_ID_RV40) { } else if (codec_id == AV_CODEC_ID_RV10 ||
codec_id == AV_CODEC_ID_RV20 ||
codec_id == AV_CODEC_ID_RV30 ||
codec_id == AV_CODEC_ID_RV40) {
extradata_offset = 26; extradata_offset = 26;
} else if (codec_id == AV_CODEC_ID_RA_144) { } else if (codec_id == AV_CODEC_ID_RA_144) {
track->audio.out_samplerate = 8000; track->audio.out_samplerate = 8000;
track->audio.channels = 1; track->audio.channels = 1;
} else if (codec_id == AV_CODEC_ID_RA_288 || codec_id == AV_CODEC_ID_COOK || } else if (codec_id == AV_CODEC_ID_RA_288 ||
codec_id == AV_CODEC_ID_ATRAC3 || codec_id == AV_CODEC_ID_SIPR) { codec_id == AV_CODEC_ID_COOK ||
codec_id == AV_CODEC_ID_ATRAC3 ||
codec_id == AV_CODEC_ID_SIPR) {
int flavor; int flavor;
ffio_init_context(&b, track->codec_priv.data,track->codec_priv.size, ffio_init_context(&b, track->codec_priv.data,
track->codec_priv.size,
0, NULL, NULL, NULL, NULL); 0, NULL, NULL, NULL, NULL);
avio_skip(&b, 22); avio_skip(&b, 22);
flavor = avio_rb16(&b); flavor = avio_rb16(&b);
...@@ -1630,11 +1697,14 @@ static int matroska_read_header(AVFormatContext *s) ...@@ -1630,11 +1697,14 @@ static int matroska_read_header(AVFormatContext *s)
track->audio.sub_packet_h = avio_rb16(&b); track->audio.sub_packet_h = avio_rb16(&b);
track->audio.frame_size = avio_rb16(&b); track->audio.frame_size = avio_rb16(&b);
track->audio.sub_packet_size = avio_rb16(&b); track->audio.sub_packet_size = avio_rb16(&b);
if (flavor <= 0 || track->audio.coded_framesize <= 0 || if (flavor <= 0 ||
track->audio.sub_packet_h <= 0 || track->audio.frame_size <= 0 || track->audio.coded_framesize <= 0 ||
track->audio.sub_packet_h <= 0 ||
track->audio.frame_size <= 0 ||
track->audio.sub_packet_size <= 0) track->audio.sub_packet_size <= 0)
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
track->audio.buf = av_malloc(track->audio.frame_size * track->audio.sub_packet_h); track->audio.buf = av_malloc(track->audio.frame_size *
track->audio.sub_packet_h);
if (codec_id == AV_CODEC_ID_RA_288) { if (codec_id == AV_CODEC_ID_RA_288) {
st->codec->block_align = track->audio.coded_framesize; st->codec->block_align = track->audio.coded_framesize;
track->codec_priv.size = 0; track->codec_priv.size = 0;
...@@ -1656,7 +1726,8 @@ static int matroska_read_header(AVFormatContext *s) ...@@ -1656,7 +1726,8 @@ static int matroska_read_header(AVFormatContext *s)
if (track->time_scale < 0.01) if (track->time_scale < 0.01)
track->time_scale = 1.0; track->time_scale = 1.0;
avpriv_set_pts_info(st, 64, matroska->time_scale*track->time_scale, 1000*1000*1000); /* 64 bit pts in ns */ avpriv_set_pts_info(st, 64, matroska->time_scale * track->time_scale,
1000 * 1000 * 1000); /* 64 bit pts in ns */
st->codec->codec_id = codec_id; st->codec->codec_id = codec_id;
st->start_time = 0; st->start_time = 0;
...@@ -1670,13 +1741,13 @@ static int matroska_read_header(AVFormatContext *s) ...@@ -1670,13 +1741,13 @@ static int matroska_read_header(AVFormatContext *s)
st->disposition |= AV_DISPOSITION_FORCED; st->disposition |= AV_DISPOSITION_FORCED;
if (!st->codec->extradata) { if (!st->codec->extradata) {
if(extradata){ if (extradata) {
st->codec->extradata = extradata; st->codec->extradata = extradata;
st->codec->extradata_size = extradata_size; st->codec->extradata_size = extradata_size;
} else if(track->codec_priv.data && track->codec_priv.size > 0){ } else if (track->codec_priv.data && track->codec_priv.size > 0) {
st->codec->extradata = av_mallocz(track->codec_priv.size + st->codec->extradata = av_mallocz(track->codec_priv.size +
FF_INPUT_BUFFER_PADDING_SIZE); FF_INPUT_BUFFER_PADDING_SIZE);
if(st->codec->extradata == NULL) if (st->codec->extradata == NULL)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
st->codec->extradata_size = track->codec_priv.size; st->codec->extradata_size = track->codec_priv.size;
memcpy(st->codec->extradata, memcpy(st->codec->extradata,
...@@ -1693,7 +1764,7 @@ static int matroska_read_header(AVFormatContext *s) ...@@ -1693,7 +1764,7 @@ static int matroska_read_header(AVFormatContext *s)
av_reduce(&st->sample_aspect_ratio.num, av_reduce(&st->sample_aspect_ratio.num,
&st->sample_aspect_ratio.den, &st->sample_aspect_ratio.den,
st->codec->height * track->video.display_width, st->codec->height * track->video.display_width,
st->codec-> width * track->video.display_height, st->codec->width * track->video.display_height,
255); 255);
if (st->codec->codec_id != AV_CODEC_ID_H264 && if (st->codec->codec_id != AV_CODEC_ID_H264 &&
st->codec->codec_id != AV_CODEC_ID_HEVC) st->codec->codec_id != AV_CODEC_ID_HEVC)
...@@ -1716,7 +1787,7 @@ static int matroska_read_header(AVFormatContext *s) ...@@ -1716,7 +1787,7 @@ static int matroska_read_header(AVFormatContext *s)
} }
attachements = attachements_list->elem; attachements = attachements_list->elem;
for (j=0; j<attachements_list->nb_elem; j++) { for (j = 0; j < attachements_list->nb_elem; j++) {
if (!(attachements[j].filename && attachements[j].mime && if (!(attachements[j].filename && attachements[j].mime &&
attachements[j].bin.data && attachements[j].bin.size > 0)) { attachements[j].bin.data && attachements[j].bin.size > 0)) {
av_log(matroska->ctx, AV_LOG_ERROR, "incomplete attachment\n"); av_log(matroska->ctx, AV_LOG_ERROR, "incomplete attachment\n");
...@@ -1724,17 +1795,18 @@ static int matroska_read_header(AVFormatContext *s) ...@@ -1724,17 +1795,18 @@ static int matroska_read_header(AVFormatContext *s)
AVStream *st = avformat_new_stream(s, NULL); AVStream *st = avformat_new_stream(s, NULL);
if (st == NULL) if (st == NULL)
break; break;
av_dict_set(&st->metadata, "filename",attachements[j].filename, 0); av_dict_set(&st->metadata, "filename", attachements[j].filename, 0);
av_dict_set(&st->metadata, "mimetype", attachements[j].mime, 0); av_dict_set(&st->metadata, "mimetype", attachements[j].mime, 0);
st->codec->codec_id = AV_CODEC_ID_NONE; st->codec->codec_id = AV_CODEC_ID_NONE;
st->codec->codec_type = AVMEDIA_TYPE_ATTACHMENT; st->codec->codec_type = AVMEDIA_TYPE_ATTACHMENT;
st->codec->extradata = av_malloc(attachements[j].bin.size); st->codec->extradata = av_malloc(attachements[j].bin.size);
if(st->codec->extradata == NULL) if (st->codec->extradata == NULL)
break; break;
st->codec->extradata_size = attachements[j].bin.size; st->codec->extradata_size = attachements[j].bin.size;
memcpy(st->codec->extradata, attachements[j].bin.data, attachements[j].bin.size); memcpy(st->codec->extradata, attachements[j].bin.data,
attachements[j].bin.size);
for (i=0; ff_mkv_mime_tags[i].id != AV_CODEC_ID_NONE; i++) { for (i = 0; ff_mkv_mime_tags[i].id != AV_CODEC_ID_NONE; i++) {
if (!strncmp(ff_mkv_mime_tags[i].str, attachements[j].mime, if (!strncmp(ff_mkv_mime_tags[i].str, attachements[j].mime,
strlen(ff_mkv_mime_tags[i].str))) { strlen(ff_mkv_mime_tags[i].str))) {
st->codec->codec_id = ff_mkv_mime_tags[i].id; st->codec->codec_id = ff_mkv_mime_tags[i].id;
...@@ -1746,11 +1818,12 @@ static int matroska_read_header(AVFormatContext *s) ...@@ -1746,11 +1818,12 @@ static int matroska_read_header(AVFormatContext *s)
} }
chapters = chapters_list->elem; chapters = chapters_list->elem;
for (i=0; i<chapters_list->nb_elem; i++) for (i = 0; i < chapters_list->nb_elem; i++)
if (chapters[i].start != AV_NOPTS_VALUE && chapters[i].uid if (chapters[i].start != AV_NOPTS_VALUE && chapters[i].uid &&
&& (max_start==0 || chapters[i].start > max_start)) { (max_start == 0 || chapters[i].start > max_start)) {
chapters[i].chapter = chapters[i].chapter =
avpriv_new_chapter(s, chapters[i].uid, (AVRational){1, 1000000000}, avpriv_new_chapter(s, chapters[i].uid,
(AVRational) { 1, 1000000000 },
chapters[i].start, chapters[i].end, chapters[i].start, chapters[i].end,
chapters[i].title); chapters[i].title);
av_dict_set(&chapters[i].chapter->metadata, av_dict_set(&chapters[i].chapter->metadata,
...@@ -1778,7 +1851,8 @@ static int matroska_deliver_packet(MatroskaDemuxContext *matroska, ...@@ -1778,7 +1851,8 @@ static int matroska_deliver_packet(MatroskaDemuxContext *matroska,
memmove(&matroska->packets[0], &matroska->packets[1], memmove(&matroska->packets[0], &matroska->packets[1],
(matroska->num_packets - 1) * sizeof(AVPacket *)); (matroska->num_packets - 1) * sizeof(AVPacket *));
newpackets = av_realloc(matroska->packets, newpackets = av_realloc(matroska->packets,
(matroska->num_packets - 1) * sizeof(AVPacket *)); (matroska->num_packets - 1) *
sizeof(AVPacket *));
if (newpackets) if (newpackets)
matroska->packets = newpackets; matroska->packets = newpackets;
} else { } else {
...@@ -1810,7 +1884,7 @@ static void matroska_clear_queue(MatroskaDemuxContext *matroska) ...@@ -1810,7 +1884,7 @@ static void matroska_clear_queue(MatroskaDemuxContext *matroska)
} }
static int matroska_parse_laces(MatroskaDemuxContext *matroska, uint8_t **buf, static int matroska_parse_laces(MatroskaDemuxContext *matroska, uint8_t **buf,
int* buf_size, int type, int *buf_size, int type,
uint32_t **lace_buf, int *laces) uint32_t **lace_buf, int *laces)
{ {
int res = 0, n, size = *buf_size; int res = 0, n, size = *buf_size;
...@@ -1836,7 +1910,8 @@ static int matroska_parse_laces(MatroskaDemuxContext *matroska, uint8_t **buf, ...@@ -1836,7 +1910,8 @@ static int matroska_parse_laces(MatroskaDemuxContext *matroska, uint8_t **buf,
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
switch (type) { switch (type) {
case 0x1: /* Xiph lacing */ { case 0x1: /* Xiph lacing */
{
uint8_t temp; uint8_t temp;
uint32_t total = 0; uint32_t total = 0;
for (n = 0; res == 0 && n < *laces - 1; n++) { for (n = 0; res == 0 && n < *laces - 1; n++) {
...@@ -1872,7 +1947,8 @@ static int matroska_parse_laces(MatroskaDemuxContext *matroska, uint8_t **buf, ...@@ -1872,7 +1947,8 @@ static int matroska_parse_laces(MatroskaDemuxContext *matroska, uint8_t **buf,
lace_size[n] = size / *laces; lace_size[n] = size / *laces;
break; break;
case 0x3: /* EBML lacing */ { case 0x3: /* EBML lacing */
{
uint64_t num; uint64_t num;
uint64_t total; uint64_t total;
n = matroska_ebmlnum_uint(matroska, data, size, &num); n = matroska_ebmlnum_uint(matroska, data, size, &num);
...@@ -1917,11 +1993,9 @@ static int matroska_parse_laces(MatroskaDemuxContext *matroska, uint8_t **buf, ...@@ -1917,11 +1993,9 @@ static int matroska_parse_laces(MatroskaDemuxContext *matroska, uint8_t **buf,
} }
static int matroska_parse_rm_audio(MatroskaDemuxContext *matroska, static int matroska_parse_rm_audio(MatroskaDemuxContext *matroska,
MatroskaTrack *track, MatroskaTrack *track, AVStream *st,
AVStream *st, uint8_t *data, int size, uint64_t timecode,
uint8_t *data, int size, uint64_t duration, int64_t pos)
uint64_t timecode, uint64_t duration,
int64_t pos)
{ {
int a = st->codec->block_align; int a = st->codec->block_align;
int sps = track->audio.sub_packet_size; int sps = track->audio.sub_packet_size;
...@@ -1940,44 +2014,47 @@ static int matroska_parse_rm_audio(MatroskaDemuxContext *matroska, ...@@ -1940,44 +2014,47 @@ static int matroska_parse_rm_audio(MatroskaDemuxContext *matroska,
"Corrupt int4 RM-style audio packet size\n"); "Corrupt int4 RM-style audio packet size\n");
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
for (x=0; x<h/2; x++) for (x = 0; x < h / 2; x++)
memcpy(track->audio.buf+x*2*w+y*cfs, memcpy(track->audio.buf + x * 2 * w + y * cfs,
data+x*cfs, cfs); data + x * cfs, cfs);
} else if (st->codec->codec_id == AV_CODEC_ID_SIPR) { } else if (st->codec->codec_id == AV_CODEC_ID_SIPR) {
if (size < w) { if (size < w) {
av_log(matroska->ctx, AV_LOG_ERROR, av_log(matroska->ctx, AV_LOG_ERROR,
"Corrupt sipr RM-style audio packet size\n"); "Corrupt sipr RM-style audio packet size\n");
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
memcpy(track->audio.buf + y*w, data, w); memcpy(track->audio.buf + y * w, data, w);
} else { } else {
if (size < sps * w / sps) { if (size < sps * w / sps) {
av_log(matroska->ctx, AV_LOG_ERROR, av_log(matroska->ctx, AV_LOG_ERROR,
"Corrupt generic RM-style audio packet size\n"); "Corrupt generic RM-style audio packet size\n");
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
for (x=0; x<w/sps; x++) for (x = 0; x < w / sps; x++)
memcpy(track->audio.buf+sps*(h*x+((h+1)/2)*(y&1)+(y>>1)), data+x*sps, sps); memcpy(track->audio.buf +
sps * (h * x + ((h + 1) / 2) * (y & 1) + (y >> 1)),
data + x * sps, sps);
} }
if (++track->audio.sub_packet_cnt >= h) { if (++track->audio.sub_packet_cnt >= h) {
if (st->codec->codec_id == AV_CODEC_ID_SIPR) if (st->codec->codec_id == AV_CODEC_ID_SIPR)
ff_rm_reorder_sipr_data(track->audio.buf, h, w); ff_rm_reorder_sipr_data(track->audio.buf, h, w);
track->audio.sub_packet_cnt = 0; track->audio.sub_packet_cnt = 0;
track->audio.pkt_cnt = h*w / a; track->audio.pkt_cnt = h * w / a;
} }
} }
while (track->audio.pkt_cnt) { while (track->audio.pkt_cnt) {
AVPacket *pkt = av_mallocz(sizeof(AVPacket)); AVPacket *pkt = av_mallocz(sizeof(AVPacket));
av_new_packet(pkt, a); av_new_packet(pkt, a);
memcpy(pkt->data, track->audio.buf memcpy(pkt->data,
+ a * (h*w / a - track->audio.pkt_cnt--), a); track->audio.buf + a * (h * w / a - track->audio.pkt_cnt--),
a);
pkt->pts = track->audio.buf_timecode; pkt->pts = track->audio.buf_timecode;
track->audio.buf_timecode = AV_NOPTS_VALUE; track->audio.buf_timecode = AV_NOPTS_VALUE;
pkt->pos = pos; pkt->pos = pos;
pkt->stream_index = st->index; pkt->stream_index = st->index;
dynarray_add(&matroska->packets,&matroska->num_packets,pkt); dynarray_add(&matroska->packets, &matroska->num_packets, pkt);
} }
return 0; return 0;
...@@ -2047,7 +2124,7 @@ static int matroska_parse_wavpack(MatroskaTrack *track, uint8_t *src, ...@@ -2047,7 +2124,7 @@ static int matroska_parse_wavpack(MatroskaTrack *track, uint8_t *src,
AV_WL32(dst + offset + 20, samples); // number of samples AV_WL32(dst + offset + 20, samples); // number of samples
AV_WL32(dst + offset + 24, flags); // flags AV_WL32(dst + offset + 24, flags); // flags
AV_WL32(dst + offset + 28, crc); // crc AV_WL32(dst + offset + 28, crc); // crc
memcpy (dst + offset + 32, src, blocksize); // block data memcpy(dst + offset + 32, src, blocksize); // block data
src += blocksize; src += blocksize;
srclen -= blocksize; srclen -= blocksize;
...@@ -2065,8 +2142,7 @@ fail: ...@@ -2065,8 +2142,7 @@ fail:
} }
static int matroska_parse_frame(MatroskaDemuxContext *matroska, static int matroska_parse_frame(MatroskaDemuxContext *matroska,
MatroskaTrack *track, MatroskaTrack *track, AVStream *st,
AVStream *st,
uint8_t *data, int pkt_size, uint8_t *data, int pkt_size,
uint64_t timecode, uint64_t duration, uint64_t timecode, uint64_t duration,
int64_t pos, int is_keyframe) int64_t pos, int is_keyframe)
...@@ -2086,7 +2162,8 @@ static int matroska_parse_frame(MatroskaDemuxContext *matroska, ...@@ -2086,7 +2162,8 @@ static int matroska_parse_frame(MatroskaDemuxContext *matroska,
uint8_t *wv_data; uint8_t *wv_data;
res = matroska_parse_wavpack(track, pkt_data, &wv_data, &pkt_size); res = matroska_parse_wavpack(track, pkt_data, &wv_data, &pkt_size);
if (res < 0) { if (res < 0) {
av_log(matroska->ctx, AV_LOG_ERROR, "Error parsing a wavpack block.\n"); av_log(matroska->ctx, AV_LOG_ERROR,
"Error parsing a wavpack block.\n");
goto fail; goto fail;
} }
if (pkt_data != data) if (pkt_data != data)
...@@ -2138,11 +2215,12 @@ static int matroska_parse_frame(MatroskaDemuxContext *matroska, ...@@ -2138,11 +2215,12 @@ static int matroska_parse_frame(MatroskaDemuxContext *matroska,
st->codec->codec_id == AV_CODEC_ID_SSA) st->codec->codec_id == AV_CODEC_ID_SSA)
matroska_merge_packets(matroska->prev_pkt, pkt); matroska_merge_packets(matroska->prev_pkt, pkt);
else { else {
dynarray_add(&matroska->packets,&matroska->num_packets,pkt); dynarray_add(&matroska->packets, &matroska->num_packets, pkt);
matroska->prev_pkt = pkt; matroska->prev_pkt = pkt;
} }
return 0; return 0;
fail: fail:
if (pkt_data != data) if (pkt_data != data)
av_freep(&pkt_data); av_freep(&pkt_data);
...@@ -2188,17 +2266,19 @@ static int matroska_parse_block(MatroskaDemuxContext *matroska, uint8_t *data, ...@@ -2188,17 +2266,19 @@ static int matroska_parse_block(MatroskaDemuxContext *matroska, uint8_t *data,
if (is_keyframe == -1) if (is_keyframe == -1)
is_keyframe = flags & 0x80 ? AV_PKT_FLAG_KEY : 0; is_keyframe = flags & 0x80 ? AV_PKT_FLAG_KEY : 0;
if (cluster_time != (uint64_t)-1 if (cluster_time != (uint64_t) -1 &&
&& (block_time >= 0 || cluster_time >= -block_time)) { (block_time >= 0 || cluster_time >= -block_time)) {
timecode = cluster_time + block_time; timecode = cluster_time + block_time;
if (track->type == MATROSKA_TRACK_TYPE_SUBTITLE if (track->type == MATROSKA_TRACK_TYPE_SUBTITLE &&
&& timecode < track->end_timecode) timecode < track->end_timecode)
is_keyframe = 0; /* overlapping subtitles are not key frame */ is_keyframe = 0; /* overlapping subtitles are not key frame */
if (is_keyframe) if (is_keyframe)
av_add_index_entry(st, cluster_pos, timecode, 0,0,AVINDEX_KEYFRAME); av_add_index_entry(st, cluster_pos, timecode, 0, 0,
AVINDEX_KEYFRAME);
} }
if (matroska->skip_to_keyframe && track->type != MATROSKA_TRACK_TYPE_SUBTITLE) { if (matroska->skip_to_keyframe &&
track->type != MATROSKA_TRACK_TYPE_SUBTITLE) {
if (!is_keyframe || timecode < matroska->skip_to_timecode) if (!is_keyframe || timecode < matroska->skip_to_timecode)
return res; return res;
matroska->skip_to_keyframe = 0; matroska->skip_to_keyframe = 0;
...@@ -2231,17 +2311,15 @@ static int matroska_parse_block(MatroskaDemuxContext *matroska, uint8_t *data, ...@@ -2231,17 +2311,15 @@ static int matroska_parse_block(MatroskaDemuxContext *matroska, uint8_t *data,
st->codec->codec_id == AV_CODEC_ID_SIPR || st->codec->codec_id == AV_CODEC_ID_SIPR ||
st->codec->codec_id == AV_CODEC_ID_ATRAC3) && st->codec->codec_id == AV_CODEC_ID_ATRAC3) &&
st->codec->block_align && track->audio.sub_packet_size) { st->codec->block_align && track->audio.sub_packet_size) {
res = matroska_parse_rm_audio(matroska, track, st, data, res = matroska_parse_rm_audio(matroska, track, st, data,
lace_size[n], lace_size[n],
timecode, duration, pos); timecode, duration, pos);
if (res) if (res)
goto end; goto end;
} else { } else {
res = matroska_parse_frame(matroska, track, st, data, lace_size[n], res = matroska_parse_frame(matroska, track, st, data, lace_size[n],
timecode, duration, timecode, duration, pos,
pos, !n? is_keyframe : 0); !n ? is_keyframe : 0);
if (res) if (res)
goto end; goto end;
} }
...@@ -2298,16 +2376,16 @@ static int matroska_parse_cluster_incremental(MatroskaDemuxContext *matroska) ...@@ -2298,16 +2376,16 @@ static int matroska_parse_cluster_incremental(MatroskaDemuxContext *matroska)
int is_keyframe = blocks[i].non_simple ? !blocks[i].reference : -1; int is_keyframe = blocks[i].non_simple ? !blocks[i].reference : -1;
if (!blocks[i].non_simple) if (!blocks[i].non_simple)
blocks[i].duration = AV_NOPTS_VALUE; blocks[i].duration = AV_NOPTS_VALUE;
res = matroska_parse_block(matroska, res = matroska_parse_block(matroska, blocks[i].bin.data,
blocks[i].bin.data, blocks[i].bin.size, blocks[i].bin.size, blocks[i].bin.pos,
blocks[i].bin.pos,
matroska->current_cluster.timecode, matroska->current_cluster.timecode,
blocks[i].duration, is_keyframe, blocks[i].duration, is_keyframe,
matroska->current_cluster_pos); matroska->current_cluster_pos);
} }
} }
if (res < 0) matroska->done = 1; if (res < 0)
matroska->done = 1;
return res; return res;
} }
...@@ -2318,6 +2396,7 @@ static int matroska_parse_cluster(MatroskaDemuxContext *matroska) ...@@ -2318,6 +2396,7 @@ static int matroska_parse_cluster(MatroskaDemuxContext *matroska)
MatroskaBlock *blocks; MatroskaBlock *blocks;
int i, res; int i, res;
int64_t pos; int64_t pos;
if (!matroska->contains_ssa) if (!matroska->contains_ssa)
return matroska_parse_cluster_incremental(matroska); return matroska_parse_cluster_incremental(matroska);
pos = avio_tell(matroska->ctx->pb); pos = avio_tell(matroska->ctx->pb);
...@@ -2327,16 +2406,15 @@ static int matroska_parse_cluster(MatroskaDemuxContext *matroska) ...@@ -2327,16 +2406,15 @@ static int matroska_parse_cluster(MatroskaDemuxContext *matroska)
res = ebml_parse(matroska, matroska_clusters, &cluster); res = ebml_parse(matroska, matroska_clusters, &cluster);
blocks_list = &cluster.blocks; blocks_list = &cluster.blocks;
blocks = blocks_list->elem; blocks = blocks_list->elem;
for (i=0; i<blocks_list->nb_elem && !res; i++) for (i = 0; i < blocks_list->nb_elem && !res; i++)
if (blocks[i].bin.size > 0 && blocks[i].bin.data) { if (blocks[i].bin.size > 0 && blocks[i].bin.data) {
int is_keyframe = blocks[i].non_simple ? !blocks[i].reference : -1; int is_keyframe = blocks[i].non_simple ? !blocks[i].reference : -1;
if (!blocks[i].non_simple) if (!blocks[i].non_simple)
blocks[i].duration = AV_NOPTS_VALUE; blocks[i].duration = AV_NOPTS_VALUE;
res=matroska_parse_block(matroska, res = matroska_parse_block(matroska, blocks[i].bin.data,
blocks[i].bin.data, blocks[i].bin.size, blocks[i].bin.size, blocks[i].bin.pos,
blocks[i].bin.pos, cluster.timecode, cluster.timecode, blocks[i].duration,
blocks[i].duration, is_keyframe, is_keyframe, pos);
pos);
} }
ebml_free(matroska_cluster, &cluster); ebml_free(matroska_cluster, &cluster);
return res; return res;
...@@ -2382,7 +2460,8 @@ static int matroska_read_seek(AVFormatContext *s, int stream_index, ...@@ -2382,7 +2460,8 @@ static int matroska_read_seek(AVFormatContext *s, int stream_index,
timestamp = FFMAX(timestamp, st->index_entries[0].timestamp); timestamp = FFMAX(timestamp, st->index_entries[0].timestamp);
if ((index = av_index_search_timestamp(st, timestamp, flags)) < 0) { if ((index = av_index_search_timestamp(st, timestamp, flags)) < 0) {
avio_seek(s->pb, st->index_entries[st->nb_index_entries-1].pos, SEEK_SET); avio_seek(s->pb, st->index_entries[st->nb_index_entries - 1].pos,
SEEK_SET);
matroska->current_id = 0; matroska->current_id = 0;
while ((index = av_index_search_timestamp(st, timestamp, flags)) < 0) { while ((index = av_index_search_timestamp(st, timestamp, flags)) < 0) {
matroska_clear_queue(matroska); matroska_clear_queue(matroska);
...@@ -2396,17 +2475,20 @@ static int matroska_read_seek(AVFormatContext *s, int stream_index, ...@@ -2396,17 +2475,20 @@ static int matroska_read_seek(AVFormatContext *s, int stream_index,
return 0; return 0;
index_min = index; index_min = index;
for (i=0; i < matroska->tracks.nb_elem; i++) { for (i = 0; i < matroska->tracks.nb_elem; i++) {
tracks[i].audio.pkt_cnt = 0; tracks[i].audio.pkt_cnt = 0;
tracks[i].audio.sub_packet_cnt = 0; tracks[i].audio.sub_packet_cnt = 0;
tracks[i].audio.buf_timecode = AV_NOPTS_VALUE; tracks[i].audio.buf_timecode = AV_NOPTS_VALUE;
tracks[i].end_timecode = 0; tracks[i].end_timecode = 0;
if (tracks[i].type == MATROSKA_TRACK_TYPE_SUBTITLE if (tracks[i].type == MATROSKA_TRACK_TYPE_SUBTITLE &&
&& !tracks[i].stream->discard != AVDISCARD_ALL) { !tracks[i].stream->discard != AVDISCARD_ALL) {
index_sub = av_index_search_timestamp(tracks[i].stream, st->index_entries[index].timestamp, AVSEEK_FLAG_BACKWARD); index_sub = av_index_search_timestamp(
if (index_sub >= 0 tracks[i].stream, st->index_entries[index].timestamp,
&& st->index_entries[index_sub].pos < st->index_entries[index_min].pos AVSEEK_FLAG_BACKWARD);
&& st->index_entries[index].timestamp - st->index_entries[index_sub].timestamp < 30000000000/matroska->time_scale) if (index_sub >= 0 &&
st->index_entries[index_sub].pos < st->index_entries[index_min].pos &&
st->index_entries[index].timestamp -
st->index_entries[index_sub].timestamp < 30000000000 / matroska->time_scale)
index_min = index_sub; index_min = index_sub;
} }
} }
...@@ -2428,7 +2510,7 @@ static int matroska_read_close(AVFormatContext *s) ...@@ -2428,7 +2510,7 @@ static int matroska_read_close(AVFormatContext *s)
matroska_clear_queue(matroska); matroska_clear_queue(matroska);
for (n=0; n < matroska->tracks.nb_elem; n++) for (n = 0; n < matroska->tracks.nb_elem; n++)
if (tracks[n].type == MATROSKA_TRACK_TYPE_AUDIO) if (tracks[n].type == MATROSKA_TRACK_TYPE_AUDIO)
av_free(tracks[n].audio.buf); av_free(tracks[n].audio.buf);
ebml_free(matroska_cluster, &matroska->current_cluster); ebml_free(matroska_cluster, &matroska->current_cluster);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment