2007-06-05 01:10:54 +03:00
|
|
|
/*
|
2008-08-05 03:42:43 +03:00
|
|
|
* Matroska file demuxer
|
2008-08-05 11:28:57 +03:00
|
|
|
* Copyright (c) 2003-2008 The FFmpeg Project
|
2007-06-05 01:10:54 +03:00
|
|
|
*
|
|
|
|
* This file is part of FFmpeg.
|
|
|
|
*
|
|
|
|
* FFmpeg is free software; you can redistribute it and/or
|
|
|
|
* modify it under the terms of the GNU Lesser General Public
|
|
|
|
* License as published by the Free Software Foundation; either
|
|
|
|
* version 2.1 of the License, or (at your option) any later version.
|
|
|
|
*
|
|
|
|
* FFmpeg is distributed in the hope that it will be useful,
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
|
|
* Lesser General Public License for more details.
|
|
|
|
*
|
|
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
|
|
* License along with FFmpeg; if not, write to the Free Software
|
|
|
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
|
|
|
*/
|
|
|
|
|
|
|
|
/**
|
2010-04-20 17:45:34 +03:00
|
|
|
* @file
|
2007-06-05 01:10:54 +03:00
|
|
|
* Matroska file demuxer
|
2011-10-30 21:10:50 +03:00
|
|
|
* @author Ronald Bultje <rbultje@ronald.bitfreak.net>
|
|
|
|
* @author with a little help from Moritz Bunkus <moritz@bunkus.org>
|
|
|
|
* @author totally reworked by Aurelien Jacobs <aurel@gnuage.org>
|
|
|
|
* @see specs available on the Matroska project page: http://www.matroska.org/
|
2007-06-05 01:10:54 +03:00
|
|
|
*/
|
|
|
|
|
2008-09-05 02:26:12 +03:00
|
|
|
#include <stdio.h>
|
2007-06-05 01:10:54 +03:00
|
|
|
#include "avformat.h"
|
2010-04-12 00:44:23 +03:00
|
|
|
#include "internal.h"
|
2011-02-20 12:04:13 +02:00
|
|
|
#include "avio_internal.h"
|
2009-06-23 02:09:34 +03:00
|
|
|
/* For ff_codec_get_id(). */
|
2007-06-05 01:10:54 +03:00
|
|
|
#include "riff.h"
|
2008-07-27 18:11:04 +03:00
|
|
|
#include "isom.h"
|
2012-10-15 00:41:12 +03:00
|
|
|
#include "rmsipr.h"
|
2007-06-05 01:10:54 +03:00
|
|
|
#include "matroska.h"
|
2012-09-15 01:59:05 +03:00
|
|
|
#include "libavcodec/bytestream.h"
|
2008-04-03 00:41:48 +03:00
|
|
|
#include "libavcodec/mpeg4audio.h"
|
2013-03-07 19:11:38 +03:00
|
|
|
#include "libavutil/base64.h"
|
2011-11-27 17:04:16 +03:00
|
|
|
#include "libavutil/intfloat.h"
|
2009-01-12 00:19:48 +02:00
|
|
|
#include "libavutil/intreadwrite.h"
|
2008-08-05 03:39:47 +03:00
|
|
|
#include "libavutil/avstring.h"
|
2008-05-09 04:53:59 +03:00
|
|
|
#include "libavutil/lzo.h"
|
2011-05-22 13:46:29 +03:00
|
|
|
#include "libavutil/dict.h"
|
2009-01-14 01:44:16 +02:00
|
|
|
#if CONFIG_ZLIB
|
2008-05-14 02:32:13 +03:00
|
|
|
#include <zlib.h>
|
|
|
|
#endif
|
2009-01-14 01:44:16 +02:00
|
|
|
#if CONFIG_BZLIB
|
2008-05-16 02:12:41 +03:00
|
|
|
#include <bzlib.h>
|
|
|
|
#endif
|
2007-06-05 01:10:54 +03:00
|
|
|
|
2008-08-05 03:40:00 +03:00
|
|
|
typedef enum {
|
|
|
|
EBML_NONE,
|
|
|
|
EBML_UINT,
|
|
|
|
EBML_FLOAT,
|
|
|
|
EBML_STR,
|
|
|
|
EBML_UTF8,
|
|
|
|
EBML_BIN,
|
|
|
|
EBML_NEST,
|
|
|
|
EBML_PASS,
|
|
|
|
EBML_STOP,
|
2013-11-15 21:00:37 +03:00
|
|
|
EBML_SINT,
|
2011-02-06 12:32:03 +02:00
|
|
|
EBML_TYPE_COUNT
|
2008-08-05 03:40:00 +03:00
|
|
|
} EbmlType;
|
|
|
|
|
|
|
|
typedef const struct EbmlSyntax {
|
|
|
|
uint32_t id;
|
|
|
|
EbmlType type;
|
|
|
|
int list_elem_size;
|
|
|
|
int data_offset;
|
|
|
|
union {
|
|
|
|
uint64_t u;
|
|
|
|
double f;
|
|
|
|
const char *s;
|
|
|
|
const struct EbmlSyntax *n;
|
|
|
|
} def;
|
|
|
|
} EbmlSyntax;
|
|
|
|
|
|
|
|
typedef struct {
|
|
|
|
int nb_elem;
|
|
|
|
void *elem;
|
|
|
|
} EbmlList;
|
|
|
|
|
|
|
|
typedef struct {
|
|
|
|
int size;
|
|
|
|
uint8_t *data;
|
|
|
|
int64_t pos;
|
|
|
|
} EbmlBin;
|
|
|
|
|
2008-08-05 03:40:02 +03:00
|
|
|
typedef struct {
|
|
|
|
uint64_t version;
|
|
|
|
uint64_t max_size;
|
|
|
|
uint64_t id_length;
|
|
|
|
char *doctype;
|
|
|
|
uint64_t doctype_version;
|
|
|
|
} Ebml;
|
|
|
|
|
2008-08-05 03:40:31 +03:00
|
|
|
typedef struct {
|
|
|
|
uint64_t algo;
|
|
|
|
EbmlBin settings;
|
|
|
|
} MatroskaTrackCompression;
|
2007-06-05 01:10:54 +03:00
|
|
|
|
2013-03-07 19:11:38 +03:00
|
|
|
typedef struct {
|
|
|
|
uint64_t algo;
|
|
|
|
EbmlBin key_id;
|
|
|
|
} MatroskaTrackEncryption;
|
|
|
|
|
2008-08-05 03:40:31 +03:00
|
|
|
typedef struct {
|
|
|
|
uint64_t scope;
|
|
|
|
uint64_t type;
|
|
|
|
MatroskaTrackCompression compression;
|
2013-03-07 19:11:38 +03:00
|
|
|
MatroskaTrackEncryption encryption;
|
2008-08-05 03:40:31 +03:00
|
|
|
} MatroskaTrackEncoding;
|
2007-06-05 01:10:54 +03:00
|
|
|
|
2008-08-05 03:40:31 +03:00
|
|
|
typedef struct {
|
|
|
|
double frame_rate;
|
|
|
|
uint64_t display_width;
|
|
|
|
uint64_t display_height;
|
|
|
|
uint64_t pixel_width;
|
|
|
|
uint64_t pixel_height;
|
2011-06-14 03:00:06 +03:00
|
|
|
EbmlBin color_space;
|
2011-05-24 02:09:24 +03:00
|
|
|
uint64_t stereo_mode;
|
2013-02-05 02:17:52 +03:00
|
|
|
uint64_t alpha_mode;
|
2008-08-05 03:40:31 +03:00
|
|
|
} MatroskaTrackVideo;
|
2007-06-05 01:10:54 +03:00
|
|
|
|
2008-08-05 03:40:31 +03:00
|
|
|
typedef struct {
|
|
|
|
double samplerate;
|
|
|
|
double out_samplerate;
|
|
|
|
uint64_t bitdepth;
|
|
|
|
uint64_t channels;
|
|
|
|
|
|
|
|
/* real audio header (extracted from extradata) */
|
|
|
|
int coded_framesize;
|
|
|
|
int sub_packet_h;
|
|
|
|
int frame_size;
|
|
|
|
int sub_packet_size;
|
|
|
|
int sub_packet_cnt;
|
|
|
|
int pkt_cnt;
|
2011-02-26 13:52:01 +02:00
|
|
|
uint64_t buf_timecode;
|
2008-08-05 03:40:31 +03:00
|
|
|
uint8_t *buf;
|
|
|
|
} MatroskaTrackAudio;
|
2007-06-05 01:10:54 +03:00
|
|
|
|
2011-05-21 18:14:14 +03:00
|
|
|
typedef struct {
|
|
|
|
uint64_t uid;
|
|
|
|
uint64_t type;
|
|
|
|
} MatroskaTrackPlane;
|
|
|
|
|
|
|
|
typedef struct {
|
|
|
|
EbmlList combine_planes;
|
|
|
|
} MatroskaTrackOperation;
|
|
|
|
|
2008-08-05 03:40:31 +03:00
|
|
|
typedef struct {
|
|
|
|
uint64_t num;
|
2009-02-15 17:34:22 +02:00
|
|
|
uint64_t uid;
|
2008-08-05 03:40:31 +03:00
|
|
|
uint64_t type;
|
2009-02-15 17:29:09 +02:00
|
|
|
char *name;
|
2008-08-05 03:40:31 +03:00
|
|
|
char *codec_id;
|
|
|
|
EbmlBin codec_priv;
|
|
|
|
char *language;
|
2008-06-01 16:54:11 +03:00
|
|
|
double time_scale;
|
2007-06-05 01:10:54 +03:00
|
|
|
uint64_t default_duration;
|
2008-08-05 03:39:53 +03:00
|
|
|
uint64_t flag_default;
|
2010-07-02 19:38:44 +03:00
|
|
|
uint64_t flag_forced;
|
2013-10-14 20:42:08 +03:00
|
|
|
uint64_t codec_delay;
|
|
|
|
uint64_t seek_preroll;
|
2008-08-05 03:40:31 +03:00
|
|
|
MatroskaTrackVideo video;
|
|
|
|
MatroskaTrackAudio audio;
|
2011-05-21 18:14:14 +03:00
|
|
|
MatroskaTrackOperation operation;
|
2008-08-05 03:40:31 +03:00
|
|
|
EbmlList encodings;
|
2008-08-05 03:40:06 +03:00
|
|
|
|
|
|
|
AVStream *stream;
|
2008-09-09 15:07:10 +03:00
|
|
|
int64_t end_timecode;
|
2010-03-03 23:46:43 +02:00
|
|
|
int ms_compat;
|
2013-02-14 00:51:48 +03:00
|
|
|
uint64_t max_block_additional_id;
|
2007-06-05 01:10:54 +03:00
|
|
|
} MatroskaTrack;
|
|
|
|
|
2008-08-05 03:40:24 +03:00
|
|
|
typedef struct {
|
2009-02-15 17:34:22 +02:00
|
|
|
uint64_t uid;
|
2008-08-05 03:40:24 +03:00
|
|
|
char *filename;
|
|
|
|
char *mime;
|
|
|
|
EbmlBin bin;
|
2009-02-15 17:53:55 +02:00
|
|
|
|
|
|
|
AVStream *stream;
|
2008-08-05 03:40:24 +03:00
|
|
|
} MatroskaAttachement;
|
|
|
|
|
2008-08-05 03:40:21 +03:00
|
|
|
typedef struct {
|
|
|
|
uint64_t start;
|
|
|
|
uint64_t end;
|
|
|
|
uint64_t uid;
|
|
|
|
char *title;
|
2009-02-15 17:25:14 +02:00
|
|
|
|
|
|
|
AVChapter *chapter;
|
2008-08-05 03:40:21 +03:00
|
|
|
} MatroskaChapter;
|
|
|
|
|
2008-08-05 03:40:15 +03:00
|
|
|
typedef struct {
|
|
|
|
uint64_t track;
|
|
|
|
uint64_t pos;
|
|
|
|
} MatroskaIndexPos;
|
|
|
|
|
|
|
|
typedef struct {
|
|
|
|
uint64_t time;
|
|
|
|
EbmlList pos;
|
|
|
|
} MatroskaIndex;
|
|
|
|
|
2008-08-09 02:50:38 +03:00
|
|
|
typedef struct {
|
|
|
|
char *name;
|
|
|
|
char *string;
|
2009-02-15 18:05:37 +02:00
|
|
|
char *lang;
|
|
|
|
uint64_t def;
|
2008-08-09 02:50:38 +03:00
|
|
|
EbmlList sub;
|
|
|
|
} MatroskaTag;
|
|
|
|
|
2009-02-15 17:53:55 +02:00
|
|
|
typedef struct {
|
|
|
|
char *type;
|
|
|
|
uint64_t typevalue;
|
|
|
|
uint64_t trackuid;
|
|
|
|
uint64_t chapteruid;
|
|
|
|
uint64_t attachuid;
|
|
|
|
} MatroskaTagTarget;
|
|
|
|
|
|
|
|
typedef struct {
|
|
|
|
MatroskaTagTarget target;
|
|
|
|
EbmlList tag;
|
|
|
|
} MatroskaTags;
|
|
|
|
|
2008-08-05 03:40:36 +03:00
|
|
|
typedef struct {
|
|
|
|
uint64_t id;
|
|
|
|
uint64_t pos;
|
|
|
|
} MatroskaSeekhead;
|
|
|
|
|
2008-08-05 03:41:19 +03:00
|
|
|
typedef struct {
|
2007-06-05 01:35:16 +03:00
|
|
|
uint64_t start;
|
|
|
|
uint64_t length;
|
2007-06-05 01:10:54 +03:00
|
|
|
} MatroskaLevel;
|
|
|
|
|
2012-04-19 21:12:24 +03:00
|
|
|
typedef struct {
|
|
|
|
uint64_t timecode;
|
|
|
|
EbmlList blocks;
|
|
|
|
} MatroskaCluster;
|
|
|
|
|
2008-08-05 03:41:19 +03:00
|
|
|
typedef struct {
|
2007-06-05 01:10:54 +03:00
|
|
|
AVFormatContext *ctx;
|
|
|
|
|
2008-08-05 11:28:57 +03:00
|
|
|
/* EBML stuff */
|
2007-06-05 01:10:54 +03:00
|
|
|
int num_levels;
|
|
|
|
MatroskaLevel levels[EBML_MAX_DEPTH];
|
|
|
|
int level_up;
|
2010-06-11 19:34:01 +03:00
|
|
|
uint32_t current_id;
|
2007-06-05 01:10:54 +03:00
|
|
|
|
2008-08-05 03:40:27 +03:00
|
|
|
uint64_t time_scale;
|
|
|
|
double duration;
|
|
|
|
char *title;
|
2013-11-24 11:31:48 +03:00
|
|
|
char *muxingapp;
|
2012-03-05 21:02:48 +03:00
|
|
|
EbmlBin date_utc;
|
2008-08-05 03:40:31 +03:00
|
|
|
EbmlList tracks;
|
2008-08-05 03:40:24 +03:00
|
|
|
EbmlList attachments;
|
2008-08-05 03:40:21 +03:00
|
|
|
EbmlList chapters;
|
2008-08-05 03:40:15 +03:00
|
|
|
EbmlList index;
|
2008-08-09 02:50:38 +03:00
|
|
|
EbmlList tags;
|
2008-08-05 03:40:36 +03:00
|
|
|
EbmlList seekhead;
|
2007-06-05 01:10:54 +03:00
|
|
|
|
|
|
|
/* byte position of the segment inside the stream */
|
2008-10-03 13:16:29 +03:00
|
|
|
int64_t segment_start;
|
2007-06-05 01:10:54 +03:00
|
|
|
|
2008-08-05 11:28:57 +03:00
|
|
|
/* the packet queue */
|
2007-06-05 01:10:54 +03:00
|
|
|
AVPacket **packets;
|
|
|
|
int num_packets;
|
2008-09-29 02:06:25 +03:00
|
|
|
AVPacket *prev_pkt;
|
2007-06-05 01:10:54 +03:00
|
|
|
|
2007-06-05 01:35:16 +03:00
|
|
|
int done;
|
2007-06-05 01:10:54 +03:00
|
|
|
|
|
|
|
/* What to skip before effectively reading a packet. */
|
|
|
|
int skip_to_keyframe;
|
2008-09-09 15:01:51 +03:00
|
|
|
uint64_t skip_to_timecode;
|
2011-07-09 08:48:43 +03:00
|
|
|
|
|
|
|
/* File has a CUES element, but we defer parsing until it is needed. */
|
|
|
|
int cues_parsing_deferred;
|
2012-04-19 21:12:24 +03:00
|
|
|
|
|
|
|
int current_cluster_num_blocks;
|
|
|
|
int64_t current_cluster_pos;
|
|
|
|
MatroskaCluster current_cluster;
|
|
|
|
|
|
|
|
/* File has SSA subtitles which prevent incremental cluster parsing. */
|
|
|
|
int contains_ssa;
|
2007-06-05 01:10:54 +03:00
|
|
|
} MatroskaDemuxContext;
|
|
|
|
|
2008-08-05 03:41:05 +03:00
|
|
|
typedef struct {
|
|
|
|
uint64_t duration;
|
|
|
|
int64_t reference;
|
2009-08-10 21:06:14 +03:00
|
|
|
uint64_t non_simple;
|
2008-08-05 03:41:05 +03:00
|
|
|
EbmlBin bin;
|
2013-02-14 00:51:48 +03:00
|
|
|
uint64_t additional_id;
|
|
|
|
EbmlBin additional;
|
2013-11-14 14:58:28 +03:00
|
|
|
int64_t discard_padding;
|
2008-08-05 03:41:05 +03:00
|
|
|
} MatroskaBlock;
|
|
|
|
|
2008-08-05 03:40:02 +03:00
|
|
|
static EbmlSyntax ebml_header[] = {
|
|
|
|
{ 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_EBMLMAXIDLENGTH, EBML_UINT, 0, offsetof(Ebml,id_length), {.u=4} },
|
|
|
|
{ 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_EBMLVERSION, EBML_NONE },
|
|
|
|
{ EBML_ID_DOCTYPEVERSION, EBML_NONE },
|
|
|
|
{ 0 }
|
|
|
|
};
|
|
|
|
|
|
|
|
static EbmlSyntax ebml_syntax[] = {
|
|
|
|
{ EBML_ID_HEADER, EBML_NEST, 0, 0, {.n=ebml_header} },
|
|
|
|
{ 0 }
|
|
|
|
};
|
|
|
|
|
2008-08-05 03:40:27 +03:00
|
|
|
static EbmlSyntax matroska_info[] = {
|
|
|
|
{ MATROSKA_ID_TIMECODESCALE, EBML_UINT, 0, offsetof(MatroskaDemuxContext,time_scale), {.u=1000000} },
|
|
|
|
{ MATROSKA_ID_DURATION, EBML_FLOAT, 0, offsetof(MatroskaDemuxContext,duration) },
|
|
|
|
{ MATROSKA_ID_TITLE, EBML_UTF8, 0, offsetof(MatroskaDemuxContext,title) },
|
|
|
|
{ MATROSKA_ID_WRITINGAPP, EBML_NONE },
|
2013-11-24 11:31:48 +03:00
|
|
|
{ MATROSKA_ID_MUXINGAPP, EBML_UTF8, 0, offsetof(MatroskaDemuxContext,muxingapp) },
|
2012-03-05 21:02:48 +03:00
|
|
|
{ MATROSKA_ID_DATEUTC, EBML_BIN, 0, offsetof(MatroskaDemuxContext,date_utc) },
|
2008-08-05 03:40:27 +03:00
|
|
|
{ MATROSKA_ID_SEGMENTUID, EBML_NONE },
|
|
|
|
{ 0 }
|
|
|
|
};
|
|
|
|
|
2008-08-05 03:40:31 +03:00
|
|
|
static EbmlSyntax matroska_track_video[] = {
|
|
|
|
{ MATROSKA_ID_VIDEOFRAMERATE, EBML_FLOAT,0, offsetof(MatroskaTrackVideo,frame_rate) },
|
2013-04-04 00:40:13 +03:00
|
|
|
{ MATROSKA_ID_VIDEODISPLAYWIDTH, EBML_UINT, 0, offsetof(MatroskaTrackVideo,display_width), {.u=-1} },
|
|
|
|
{ MATROSKA_ID_VIDEODISPLAYHEIGHT, EBML_UINT, 0, offsetof(MatroskaTrackVideo,display_height), {.u=-1} },
|
2008-08-05 03:40:31 +03:00
|
|
|
{ MATROSKA_ID_VIDEOPIXELWIDTH, EBML_UINT, 0, offsetof(MatroskaTrackVideo,pixel_width) },
|
|
|
|
{ MATROSKA_ID_VIDEOPIXELHEIGHT, EBML_UINT, 0, offsetof(MatroskaTrackVideo,pixel_height) },
|
2011-06-14 03:00:06 +03:00
|
|
|
{ MATROSKA_ID_VIDEOCOLORSPACE, EBML_BIN, 0, offsetof(MatroskaTrackVideo,color_space) },
|
2011-05-24 02:09:24 +03:00
|
|
|
{ MATROSKA_ID_VIDEOSTEREOMODE, EBML_UINT, 0, offsetof(MatroskaTrackVideo,stereo_mode) },
|
2013-02-05 02:17:52 +03:00
|
|
|
{ MATROSKA_ID_VIDEOALPHAMODE, EBML_UINT, 0, offsetof(MatroskaTrackVideo,alpha_mode) },
|
2008-08-14 00:15:15 +03:00
|
|
|
{ MATROSKA_ID_VIDEOPIXELCROPB, EBML_NONE },
|
|
|
|
{ MATROSKA_ID_VIDEOPIXELCROPT, EBML_NONE },
|
|
|
|
{ MATROSKA_ID_VIDEOPIXELCROPL, EBML_NONE },
|
|
|
|
{ MATROSKA_ID_VIDEOPIXELCROPR, EBML_NONE },
|
|
|
|
{ MATROSKA_ID_VIDEODISPLAYUNIT, EBML_NONE },
|
2008-08-05 03:40:31 +03:00
|
|
|
{ MATROSKA_ID_VIDEOFLAGINTERLACED,EBML_NONE },
|
|
|
|
{ MATROSKA_ID_VIDEOASPECTRATIO, EBML_NONE },
|
|
|
|
{ 0 }
|
|
|
|
};
|
|
|
|
|
|
|
|
static EbmlSyntax matroska_track_audio[] = {
|
|
|
|
{ MATROSKA_ID_AUDIOSAMPLINGFREQ, EBML_FLOAT,0, offsetof(MatroskaTrackAudio,samplerate), {.f=8000.0} },
|
|
|
|
{ MATROSKA_ID_AUDIOOUTSAMPLINGFREQ,EBML_FLOAT,0,offsetof(MatroskaTrackAudio,out_samplerate) },
|
|
|
|
{ MATROSKA_ID_AUDIOBITDEPTH, EBML_UINT, 0, offsetof(MatroskaTrackAudio,bitdepth) },
|
|
|
|
{ MATROSKA_ID_AUDIOCHANNELS, EBML_UINT, 0, offsetof(MatroskaTrackAudio,channels), {.u=1} },
|
|
|
|
{ 0 }
|
|
|
|
};
|
|
|
|
|
|
|
|
static EbmlSyntax matroska_track_encoding_compression[] = {
|
|
|
|
{ MATROSKA_ID_ENCODINGCOMPALGO, EBML_UINT, 0, offsetof(MatroskaTrackCompression,algo), {.u=0} },
|
|
|
|
{ MATROSKA_ID_ENCODINGCOMPSETTINGS,EBML_BIN, 0, offsetof(MatroskaTrackCompression,settings) },
|
|
|
|
{ 0 }
|
|
|
|
};
|
|
|
|
|
2013-03-07 19:11:38 +03:00
|
|
|
static EbmlSyntax matroska_track_encoding_encryption[] = {
|
|
|
|
{ MATROSKA_ID_ENCODINGENCALGO, EBML_UINT, 0, offsetof(MatroskaTrackEncryption,algo), {.u=0} },
|
|
|
|
{ MATROSKA_ID_ENCODINGENCKEYID, EBML_BIN, 0, offsetof(MatroskaTrackEncryption,key_id) },
|
|
|
|
{ MATROSKA_ID_ENCODINGENCAESSETTINGS, EBML_NONE },
|
|
|
|
{ MATROSKA_ID_ENCODINGSIGALGO, EBML_NONE },
|
|
|
|
{ MATROSKA_ID_ENCODINGSIGHASHALGO, EBML_NONE },
|
|
|
|
{ MATROSKA_ID_ENCODINGSIGKEYID, EBML_NONE },
|
|
|
|
{ MATROSKA_ID_ENCODINGSIGNATURE, EBML_NONE },
|
|
|
|
{ 0 }
|
|
|
|
};
|
2008-08-05 03:40:31 +03:00
|
|
|
static EbmlSyntax matroska_track_encoding[] = {
|
|
|
|
{ MATROSKA_ID_ENCODINGSCOPE, EBML_UINT, 0, offsetof(MatroskaTrackEncoding,scope), {.u=1} },
|
|
|
|
{ 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} },
|
2013-03-07 19:11:38 +03:00
|
|
|
{ MATROSKA_ID_ENCODINGENCRYPTION, EBML_NEST, 0, offsetof(MatroskaTrackEncoding,encryption), {.n=matroska_track_encoding_encryption} },
|
2008-08-14 00:15:15 +03:00
|
|
|
{ MATROSKA_ID_ENCODINGORDER, EBML_NONE },
|
2008-08-05 03:40:31 +03:00
|
|
|
{ 0 }
|
|
|
|
};
|
|
|
|
|
|
|
|
static EbmlSyntax matroska_track_encodings[] = {
|
|
|
|
{ MATROSKA_ID_TRACKCONTENTENCODING, EBML_NEST, sizeof(MatroskaTrackEncoding), offsetof(MatroskaTrack,encodings), {.n=matroska_track_encoding} },
|
|
|
|
{ 0 }
|
|
|
|
};
|
|
|
|
|
2011-05-21 18:14:14 +03:00
|
|
|
static EbmlSyntax matroska_track_plane[] = {
|
|
|
|
{ MATROSKA_ID_TRACKPLANEUID, EBML_UINT, 0, offsetof(MatroskaTrackPlane,uid) },
|
|
|
|
{ MATROSKA_ID_TRACKPLANETYPE, EBML_UINT, 0, offsetof(MatroskaTrackPlane,type) },
|
|
|
|
{ 0 }
|
|
|
|
};
|
|
|
|
|
|
|
|
static EbmlSyntax matroska_track_combine_planes[] = {
|
|
|
|
{ MATROSKA_ID_TRACKPLANE, EBML_NEST, sizeof(MatroskaTrackPlane), offsetof(MatroskaTrackOperation,combine_planes), {.n=matroska_track_plane} },
|
|
|
|
{ 0 }
|
|
|
|
};
|
|
|
|
|
|
|
|
static EbmlSyntax matroska_track_operation[] = {
|
|
|
|
{ MATROSKA_ID_TRACKCOMBINEPLANES, EBML_NEST, 0, 0, {.n=matroska_track_combine_planes} },
|
|
|
|
{ 0 }
|
|
|
|
};
|
|
|
|
|
2008-08-05 03:40:31 +03:00
|
|
|
static EbmlSyntax matroska_track[] = {
|
|
|
|
{ MATROSKA_ID_TRACKNUMBER, EBML_UINT, 0, offsetof(MatroskaTrack,num) },
|
2009-02-15 17:29:09 +02:00
|
|
|
{ MATROSKA_ID_TRACKNAME, EBML_UTF8, 0, offsetof(MatroskaTrack,name) },
|
2009-02-15 17:34:22 +02:00
|
|
|
{ MATROSKA_ID_TRACKUID, EBML_UINT, 0, offsetof(MatroskaTrack,uid) },
|
2008-08-05 03:40:31 +03:00
|
|
|
{ MATROSKA_ID_TRACKTYPE, EBML_UINT, 0, offsetof(MatroskaTrack,type) },
|
|
|
|
{ MATROSKA_ID_CODECID, EBML_STR, 0, offsetof(MatroskaTrack,codec_id) },
|
|
|
|
{ MATROSKA_ID_CODECPRIVATE, EBML_BIN, 0, offsetof(MatroskaTrack,codec_priv) },
|
|
|
|
{ MATROSKA_ID_TRACKLANGUAGE, EBML_UTF8, 0, offsetof(MatroskaTrack,language), {.s="eng"} },
|
|
|
|
{ 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_TRACKFLAGDEFAULT, EBML_UINT, 0, offsetof(MatroskaTrack,flag_default), {.u=1} },
|
2010-07-02 19:38:44 +03:00
|
|
|
{ MATROSKA_ID_TRACKFLAGFORCED, EBML_UINT, 0, offsetof(MatroskaTrack,flag_forced), {.u=0} },
|
2008-08-05 03:40:31 +03:00
|
|
|
{ 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} },
|
2011-05-21 18:14:14 +03:00
|
|
|
{ MATROSKA_ID_TRACKOPERATION, EBML_NEST, 0, offsetof(MatroskaTrack,operation), {.n=matroska_track_operation} },
|
2008-08-05 03:40:31 +03:00
|
|
|
{ MATROSKA_ID_TRACKCONTENTENCODINGS,EBML_NEST, 0, 0, {.n=matroska_track_encodings} },
|
2013-02-14 00:51:48 +03:00
|
|
|
{ MATROSKA_ID_TRACKMAXBLKADDID, EBML_UINT, 0, offsetof(MatroskaTrack,max_block_additional_id) },
|
2013-10-14 20:42:08 +03:00
|
|
|
{ MATROSKA_ID_CODECDELAY, EBML_UINT, 0, offsetof(MatroskaTrack,codec_delay) },
|
|
|
|
{ MATROSKA_ID_SEEKPREROLL, EBML_UINT, 0, offsetof(MatroskaTrack,seek_preroll) },
|
2008-08-05 03:40:31 +03:00
|
|
|
{ MATROSKA_ID_TRACKFLAGENABLED, EBML_NONE },
|
|
|
|
{ MATROSKA_ID_TRACKFLAGLACING, EBML_NONE },
|
|
|
|
{ MATROSKA_ID_CODECNAME, EBML_NONE },
|
|
|
|
{ MATROSKA_ID_CODECDECODEALL, EBML_NONE },
|
|
|
|
{ MATROSKA_ID_CODECINFOURL, EBML_NONE },
|
|
|
|
{ MATROSKA_ID_CODECDOWNLOADURL, EBML_NONE },
|
|
|
|
{ MATROSKA_ID_TRACKMINCACHE, EBML_NONE },
|
|
|
|
{ MATROSKA_ID_TRACKMAXCACHE, EBML_NONE },
|
|
|
|
{ 0 }
|
|
|
|
};
|
|
|
|
|
|
|
|
static EbmlSyntax matroska_tracks[] = {
|
|
|
|
{ MATROSKA_ID_TRACKENTRY, EBML_NEST, sizeof(MatroskaTrack), offsetof(MatroskaDemuxContext,tracks), {.n=matroska_track} },
|
|
|
|
{ 0 }
|
|
|
|
};
|
|
|
|
|
2008-08-05 03:40:24 +03:00
|
|
|
static EbmlSyntax matroska_attachment[] = {
|
2009-02-15 17:34:22 +02:00
|
|
|
{ MATROSKA_ID_FILEUID, EBML_UINT, 0, offsetof(MatroskaAttachement,uid) },
|
2008-08-05 03:40:24 +03:00
|
|
|
{ MATROSKA_ID_FILENAME, EBML_UTF8, 0, offsetof(MatroskaAttachement,filename) },
|
|
|
|
{ MATROSKA_ID_FILEMIMETYPE, EBML_STR, 0, offsetof(MatroskaAttachement,mime) },
|
|
|
|
{ MATROSKA_ID_FILEDATA, EBML_BIN, 0, offsetof(MatroskaAttachement,bin) },
|
2008-08-14 00:15:15 +03:00
|
|
|
{ MATROSKA_ID_FILEDESC, EBML_NONE },
|
2008-08-05 03:40:24 +03:00
|
|
|
{ 0 }
|
|
|
|
};
|
|
|
|
|
|
|
|
static EbmlSyntax matroska_attachments[] = {
|
|
|
|
{ MATROSKA_ID_ATTACHEDFILE, EBML_NEST, sizeof(MatroskaAttachement), offsetof(MatroskaDemuxContext,attachments), {.n=matroska_attachment} },
|
|
|
|
{ 0 }
|
|
|
|
};
|
|
|
|
|
2008-08-05 03:40:21 +03:00
|
|
|
static EbmlSyntax matroska_chapter_display[] = {
|
|
|
|
{ MATROSKA_ID_CHAPSTRING, EBML_UTF8, 0, offsetof(MatroskaChapter,title) },
|
2008-08-14 00:15:15 +03:00
|
|
|
{ MATROSKA_ID_CHAPLANG, EBML_NONE },
|
2008-08-05 03:40:21 +03:00
|
|
|
{ 0 }
|
|
|
|
};
|
|
|
|
|
|
|
|
static EbmlSyntax matroska_chapter_entry[] = {
|
|
|
|
{ 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_CHAPTERUID, EBML_UINT, 0, offsetof(MatroskaChapter,uid) },
|
|
|
|
{ MATROSKA_ID_CHAPTERDISPLAY, EBML_NEST, 0, 0, {.n=matroska_chapter_display} },
|
|
|
|
{ MATROSKA_ID_CHAPTERFLAGHIDDEN, EBML_NONE },
|
2008-08-14 00:15:15 +03:00
|
|
|
{ MATROSKA_ID_CHAPTERFLAGENABLED, EBML_NONE },
|
|
|
|
{ MATROSKA_ID_CHAPTERPHYSEQUIV, EBML_NONE },
|
|
|
|
{ MATROSKA_ID_CHAPTERATOM, EBML_NONE },
|
2008-08-05 03:40:21 +03:00
|
|
|
{ 0 }
|
|
|
|
};
|
|
|
|
|
|
|
|
static EbmlSyntax matroska_chapter[] = {
|
|
|
|
{ MATROSKA_ID_CHAPTERATOM, EBML_NEST, sizeof(MatroskaChapter), offsetof(MatroskaDemuxContext,chapters), {.n=matroska_chapter_entry} },
|
|
|
|
{ MATROSKA_ID_EDITIONUID, EBML_NONE },
|
|
|
|
{ MATROSKA_ID_EDITIONFLAGHIDDEN, EBML_NONE },
|
|
|
|
{ MATROSKA_ID_EDITIONFLAGDEFAULT, EBML_NONE },
|
2008-08-14 00:15:15 +03:00
|
|
|
{ MATROSKA_ID_EDITIONFLAGORDERED, EBML_NONE },
|
2008-08-05 03:40:21 +03:00
|
|
|
{ 0 }
|
|
|
|
};
|
|
|
|
|
|
|
|
static EbmlSyntax matroska_chapters[] = {
|
|
|
|
{ MATROSKA_ID_EDITIONENTRY, EBML_NEST, 0, 0, {.n=matroska_chapter} },
|
|
|
|
{ 0 }
|
|
|
|
};
|
|
|
|
|
2008-08-05 03:40:15 +03:00
|
|
|
static EbmlSyntax matroska_index_pos[] = {
|
|
|
|
{ MATROSKA_ID_CUETRACK, EBML_UINT, 0, offsetof(MatroskaIndexPos,track) },
|
|
|
|
{ MATROSKA_ID_CUECLUSTERPOSITION, EBML_UINT, 0, offsetof(MatroskaIndexPos,pos) },
|
2013-09-15 12:32:36 +03:00
|
|
|
{ MATROSKA_ID_CUERELATIVEPOSITION,EBML_NONE },
|
2013-09-21 04:15:49 +03:00
|
|
|
{ MATROSKA_ID_CUEDURATION, EBML_NONE },
|
2008-08-14 00:15:15 +03:00
|
|
|
{ MATROSKA_ID_CUEBLOCKNUMBER, EBML_NONE },
|
2008-08-05 03:40:15 +03:00
|
|
|
{ 0 }
|
|
|
|
};
|
|
|
|
|
|
|
|
static EbmlSyntax matroska_index_entry[] = {
|
|
|
|
{ MATROSKA_ID_CUETIME, EBML_UINT, 0, offsetof(MatroskaIndex,time) },
|
|
|
|
{ MATROSKA_ID_CUETRACKPOSITION, EBML_NEST, sizeof(MatroskaIndexPos), offsetof(MatroskaIndex,pos), {.n=matroska_index_pos} },
|
|
|
|
{ 0 }
|
|
|
|
};
|
|
|
|
|
|
|
|
static EbmlSyntax matroska_index[] = {
|
|
|
|
{ MATROSKA_ID_POINTENTRY, EBML_NEST, sizeof(MatroskaIndex), offsetof(MatroskaDemuxContext,index), {.n=matroska_index_entry} },
|
|
|
|
{ 0 }
|
|
|
|
};
|
|
|
|
|
2008-08-09 02:50:38 +03:00
|
|
|
static EbmlSyntax matroska_simpletag[] = {
|
|
|
|
{ MATROSKA_ID_TAGNAME, EBML_UTF8, 0, offsetof(MatroskaTag,name) },
|
|
|
|
{ MATROSKA_ID_TAGSTRING, EBML_UTF8, 0, offsetof(MatroskaTag,string) },
|
2009-02-15 18:05:37 +02:00
|
|
|
{ MATROSKA_ID_TAGLANG, EBML_STR, 0, offsetof(MatroskaTag,lang), {.s="und"} },
|
|
|
|
{ MATROSKA_ID_TAGDEFAULT, EBML_UINT, 0, offsetof(MatroskaTag,def) },
|
2010-06-08 22:28:22 +03:00
|
|
|
{ MATROSKA_ID_TAGDEFAULT_BUG, EBML_UINT, 0, offsetof(MatroskaTag,def) },
|
2008-08-09 02:50:38 +03:00
|
|
|
{ MATROSKA_ID_SIMPLETAG, EBML_NEST, sizeof(MatroskaTag), offsetof(MatroskaTag,sub), {.n=matroska_simpletag} },
|
|
|
|
{ 0 }
|
|
|
|
};
|
|
|
|
|
2009-02-15 17:53:55 +02:00
|
|
|
static EbmlSyntax matroska_tagtargets[] = {
|
|
|
|
{ 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_TRACKUID, EBML_UINT, 0, offsetof(MatroskaTagTarget,trackuid) },
|
|
|
|
{ MATROSKA_ID_TAGTARGETS_CHAPTERUID,EBML_UINT, 0, offsetof(MatroskaTagTarget,chapteruid) },
|
|
|
|
{ MATROSKA_ID_TAGTARGETS_ATTACHUID, EBML_UINT, 0, offsetof(MatroskaTagTarget,attachuid) },
|
|
|
|
{ 0 }
|
|
|
|
};
|
|
|
|
|
2008-08-09 02:50:38 +03:00
|
|
|
static EbmlSyntax matroska_tag[] = {
|
2009-02-15 17:53:55 +02:00
|
|
|
{ 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} },
|
2008-08-09 02:50:38 +03:00
|
|
|
{ 0 }
|
|
|
|
};
|
|
|
|
|
2008-08-05 03:40:18 +03:00
|
|
|
static EbmlSyntax matroska_tags[] = {
|
2009-02-15 17:53:55 +02:00
|
|
|
{ MATROSKA_ID_TAG, EBML_NEST, sizeof(MatroskaTags), offsetof(MatroskaDemuxContext,tags), {.n=matroska_tag} },
|
2008-08-05 03:40:18 +03:00
|
|
|
{ 0 }
|
|
|
|
};
|
|
|
|
|
2008-08-05 03:40:36 +03:00
|
|
|
static EbmlSyntax matroska_seekhead_entry[] = {
|
|
|
|
{ MATROSKA_ID_SEEKID, EBML_UINT, 0, offsetof(MatroskaSeekhead,id) },
|
|
|
|
{ MATROSKA_ID_SEEKPOSITION, EBML_UINT, 0, offsetof(MatroskaSeekhead,pos), {.u=-1} },
|
|
|
|
{ 0 }
|
|
|
|
};
|
|
|
|
|
|
|
|
static EbmlSyntax matroska_seekhead[] = {
|
|
|
|
{ MATROSKA_ID_SEEKENTRY, EBML_NEST, sizeof(MatroskaSeekhead), offsetof(MatroskaDemuxContext,seekhead), {.n=matroska_seekhead_entry} },
|
|
|
|
{ 0 }
|
|
|
|
};
|
|
|
|
|
2008-08-05 03:40:58 +03:00
|
|
|
static EbmlSyntax matroska_segment[] = {
|
|
|
|
{ MATROSKA_ID_INFO, EBML_NEST, 0, 0, {.n=matroska_info } },
|
|
|
|
{ MATROSKA_ID_TRACKS, EBML_NEST, 0, 0, {.n=matroska_tracks } },
|
|
|
|
{ MATROSKA_ID_ATTACHMENTS, EBML_NEST, 0, 0, {.n=matroska_attachments} },
|
|
|
|
{ MATROSKA_ID_CHAPTERS, EBML_NEST, 0, 0, {.n=matroska_chapters } },
|
|
|
|
{ MATROSKA_ID_CUES, EBML_NEST, 0, 0, {.n=matroska_index } },
|
|
|
|
{ MATROSKA_ID_TAGS, EBML_NEST, 0, 0, {.n=matroska_tags } },
|
|
|
|
{ MATROSKA_ID_SEEKHEAD, EBML_NEST, 0, 0, {.n=matroska_seekhead } },
|
2010-06-11 19:36:51 +03:00
|
|
|
{ MATROSKA_ID_CLUSTER, EBML_STOP },
|
2008-08-05 03:40:58 +03:00
|
|
|
{ 0 }
|
|
|
|
};
|
|
|
|
|
|
|
|
static EbmlSyntax matroska_segments[] = {
|
|
|
|
{ MATROSKA_ID_SEGMENT, EBML_NEST, 0, 0, {.n=matroska_segment } },
|
|
|
|
{ 0 }
|
|
|
|
};
|
|
|
|
|
2013-02-14 00:51:48 +03:00
|
|
|
static EbmlSyntax matroska_blockmore[] = {
|
|
|
|
{ MATROSKA_ID_BLOCKADDID, EBML_UINT, 0, offsetof(MatroskaBlock,additional_id) },
|
|
|
|
{ MATROSKA_ID_BLOCKADDITIONAL, EBML_BIN, 0, offsetof(MatroskaBlock,additional) },
|
|
|
|
{ 0 }
|
|
|
|
};
|
|
|
|
|
|
|
|
static EbmlSyntax matroska_blockadditions[] = {
|
|
|
|
{ MATROSKA_ID_BLOCKMORE, EBML_NEST, 0, 0, {.n=matroska_blockmore} },
|
|
|
|
{ 0 }
|
|
|
|
};
|
|
|
|
|
2008-08-05 03:41:05 +03:00
|
|
|
static EbmlSyntax matroska_blockgroup[] = {
|
|
|
|
{ MATROSKA_ID_BLOCK, EBML_BIN, 0, offsetof(MatroskaBlock,bin) },
|
2013-02-14 00:51:48 +03:00
|
|
|
{ MATROSKA_ID_BLOCKADDITIONS, EBML_NEST, 0, 0, {.n=matroska_blockadditions} },
|
2008-08-05 03:41:05 +03:00
|
|
|
{ MATROSKA_ID_SIMPLEBLOCK, EBML_BIN, 0, offsetof(MatroskaBlock,bin) },
|
2011-03-17 00:37:16 +02:00
|
|
|
{ MATROSKA_ID_BLOCKDURATION, EBML_UINT, 0, offsetof(MatroskaBlock,duration) },
|
2013-11-14 14:58:28 +03:00
|
|
|
{ MATROSKA_ID_DISCARDPADDING, EBML_SINT, 0, offsetof(MatroskaBlock,discard_padding) },
|
2013-11-16 03:12:20 +03:00
|
|
|
{ MATROSKA_ID_BLOCKREFERENCE, EBML_SINT, 0, offsetof(MatroskaBlock,reference) },
|
2013-05-15 16:48:15 +03:00
|
|
|
{ MATROSKA_ID_CODECSTATE, EBML_NONE },
|
2009-08-10 21:06:14 +03:00
|
|
|
{ 1, EBML_UINT, 0, offsetof(MatroskaBlock,non_simple), {.u=1} },
|
2008-08-05 03:41:05 +03:00
|
|
|
{ 0 }
|
|
|
|
};
|
|
|
|
|
|
|
|
static EbmlSyntax matroska_cluster[] = {
|
|
|
|
{ MATROSKA_ID_CLUSTERTIMECODE,EBML_UINT,0, offsetof(MatroskaCluster,timecode) },
|
|
|
|
{ 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} },
|
2008-08-14 00:15:15 +03:00
|
|
|
{ MATROSKA_ID_CLUSTERPOSITION,EBML_NONE },
|
|
|
|
{ MATROSKA_ID_CLUSTERPREVSIZE,EBML_NONE },
|
2008-08-05 03:41:05 +03:00
|
|
|
{ 0 }
|
|
|
|
};
|
|
|
|
|
|
|
|
static EbmlSyntax matroska_clusters[] = {
|
|
|
|
{ MATROSKA_ID_CLUSTER, EBML_NEST, 0, 0, {.n=matroska_cluster} },
|
2008-08-14 00:15:15 +03:00
|
|
|
{ MATROSKA_ID_INFO, EBML_NONE },
|
|
|
|
{ MATROSKA_ID_CUES, EBML_NONE },
|
|
|
|
{ MATROSKA_ID_TAGS, EBML_NONE },
|
|
|
|
{ MATROSKA_ID_SEEKHEAD, EBML_NONE },
|
2008-08-05 03:41:05 +03:00
|
|
|
{ 0 }
|
|
|
|
};
|
|
|
|
|
2012-04-19 21:12:24 +03:00
|
|
|
static EbmlSyntax matroska_cluster_incremental_parsing[] = {
|
|
|
|
{ MATROSKA_ID_CLUSTERTIMECODE,EBML_UINT,0, offsetof(MatroskaCluster,timecode) },
|
|
|
|
{ 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_CLUSTERPOSITION,EBML_NONE },
|
|
|
|
{ MATROSKA_ID_CLUSTERPREVSIZE,EBML_NONE },
|
|
|
|
{ MATROSKA_ID_INFO, EBML_NONE },
|
|
|
|
{ MATROSKA_ID_CUES, EBML_NONE },
|
|
|
|
{ MATROSKA_ID_TAGS, EBML_NONE },
|
|
|
|
{ MATROSKA_ID_SEEKHEAD, EBML_NONE },
|
|
|
|
{ MATROSKA_ID_CLUSTER, EBML_STOP },
|
|
|
|
{ 0 }
|
|
|
|
};
|
|
|
|
|
|
|
|
static EbmlSyntax matroska_cluster_incremental[] = {
|
|
|
|
{ MATROSKA_ID_CLUSTERTIMECODE,EBML_UINT,0, offsetof(MatroskaCluster,timecode) },
|
|
|
|
{ MATROSKA_ID_BLOCKGROUP, EBML_STOP },
|
|
|
|
{ MATROSKA_ID_SIMPLEBLOCK, EBML_STOP },
|
|
|
|
{ MATROSKA_ID_CLUSTERPOSITION,EBML_NONE },
|
|
|
|
{ MATROSKA_ID_CLUSTERPREVSIZE,EBML_NONE },
|
|
|
|
{ 0 }
|
|
|
|
};
|
|
|
|
|
|
|
|
static EbmlSyntax matroska_clusters_incremental[] = {
|
|
|
|
{ MATROSKA_ID_CLUSTER, EBML_NEST, 0, 0, {.n=matroska_cluster_incremental} },
|
|
|
|
{ MATROSKA_ID_INFO, EBML_NONE },
|
|
|
|
{ MATROSKA_ID_CUES, EBML_NONE },
|
|
|
|
{ MATROSKA_ID_TAGS, EBML_NONE },
|
|
|
|
{ MATROSKA_ID_SEEKHEAD, EBML_NONE },
|
|
|
|
{ 0 }
|
|
|
|
};
|
|
|
|
|
2012-02-20 11:42:33 +03:00
|
|
|
static const char *const matroska_doctypes[] = { "matroska", "webm" };
|
2010-05-22 04:41:32 +03:00
|
|
|
|
2012-02-14 01:06:19 +03:00
|
|
|
static int matroska_resync(MatroskaDemuxContext *matroska, int64_t last_pos)
|
|
|
|
{
|
|
|
|
AVIOContext *pb = matroska->ctx->pb;
|
|
|
|
uint32_t id;
|
|
|
|
matroska->current_id = 0;
|
|
|
|
matroska->num_levels = 0;
|
|
|
|
|
2013-05-28 01:11:50 +03:00
|
|
|
/* seek to next position to resync from */
|
|
|
|
if (avio_seek(pb, last_pos + 1, SEEK_SET) < 0)
|
2012-02-14 01:06:19 +03:00
|
|
|
goto eof;
|
|
|
|
|
|
|
|
id = avio_rb32(pb);
|
|
|
|
|
|
|
|
// try to find a toplevel element
|
|
|
|
while (!url_feof(pb)) {
|
2013-05-28 01:11:50 +03:00
|
|
|
if (id == MATROSKA_ID_INFO || id == MATROSKA_ID_TRACKS ||
|
|
|
|
id == MATROSKA_ID_CUES || id == MATROSKA_ID_TAGS ||
|
2012-02-14 01:06:19 +03:00
|
|
|
id == MATROSKA_ID_SEEKHEAD || id == MATROSKA_ID_ATTACHMENTS ||
|
2013-05-28 01:11:50 +03:00
|
|
|
id == MATROSKA_ID_CLUSTER || id == MATROSKA_ID_CHAPTERS) {
|
|
|
|
matroska->current_id = id;
|
|
|
|
return 0;
|
2012-02-14 01:06:19 +03:00
|
|
|
}
|
|
|
|
id = (id << 8) | avio_r8(pb);
|
|
|
|
}
|
|
|
|
eof:
|
|
|
|
matroska->done = 1;
|
|
|
|
return AVERROR_EOF;
|
|
|
|
}
|
|
|
|
|
2007-06-05 01:10:54 +03:00
|
|
|
/*
|
2008-08-05 11:28:57 +03:00
|
|
|
* Return: Whether we reached the end of a level in the hierarchy or not.
|
2007-06-05 01:10:54 +03:00
|
|
|
*/
|
2008-08-05 03:42:08 +03:00
|
|
|
static int ebml_level_end(MatroskaDemuxContext *matroska)
|
2007-06-05 01:10:54 +03:00
|
|
|
{
|
2011-02-20 12:04:12 +02:00
|
|
|
AVIOContext *pb = matroska->ctx->pb;
|
2011-03-03 21:11:45 +02:00
|
|
|
int64_t pos = avio_tell(pb);
|
2007-06-05 01:10:54 +03:00
|
|
|
|
2008-08-05 03:42:08 +03:00
|
|
|
if (matroska->num_levels > 0) {
|
2007-06-05 01:10:54 +03:00
|
|
|
MatroskaLevel *level = &matroska->levels[matroska->num_levels - 1];
|
2010-06-11 19:43:47 +03:00
|
|
|
if (pos - level->start >= level->length || matroska->current_id) {
|
2007-06-05 01:10:54 +03:00
|
|
|
matroska->num_levels--;
|
2008-08-05 03:42:08 +03:00
|
|
|
return 1;
|
2007-06-05 01:10:54 +03:00
|
|
|
}
|
|
|
|
}
|
2008-08-05 03:42:08 +03:00
|
|
|
return 0;
|
2007-06-05 01:10:54 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Read: an "EBML number", which is defined as a variable-length
|
|
|
|
* array of bytes. The first byte indicates the length by giving a
|
|
|
|
* number of 0-bits followed by a one. The position of the first
|
|
|
|
* "one" bit inside the first byte indicates the length of this
|
|
|
|
* number.
|
2008-08-05 11:28:57 +03:00
|
|
|
* Returns: number of bytes read, < 0 on error
|
2007-06-05 01:10:54 +03:00
|
|
|
*/
|
2011-02-20 12:04:12 +02:00
|
|
|
static int ebml_read_num(MatroskaDemuxContext *matroska, AVIOContext *pb,
|
2008-08-05 03:42:05 +03:00
|
|
|
int max_size, uint64_t *number)
|
2007-06-05 01:10:54 +03:00
|
|
|
{
|
2010-09-02 22:17:46 +03:00
|
|
|
int read = 1, n = 1;
|
|
|
|
uint64_t total = 0;
|
2007-06-05 01:10:54 +03:00
|
|
|
|
2011-02-21 17:43:01 +02:00
|
|
|
/* The first byte tells us the length in bytes - avio_r8() can normally
|
2007-06-05 01:10:54 +03:00
|
|
|
* return 0, but since that's not a valid first ebmlID byte, we can
|
|
|
|
* use it safely here to catch EOS. */
|
2011-02-21 17:43:01 +02:00
|
|
|
if (!(total = avio_r8(pb))) {
|
2007-06-05 01:10:54 +03:00
|
|
|
/* we might encounter EOS here */
|
|
|
|
if (!url_feof(pb)) {
|
2011-03-03 21:11:45 +02:00
|
|
|
int64_t pos = avio_tell(pb);
|
2007-06-05 01:10:54 +03:00
|
|
|
av_log(matroska->ctx, AV_LOG_ERROR,
|
|
|
|
"Read error at pos. %"PRIu64" (0x%"PRIx64")\n",
|
|
|
|
pos, pos);
|
2012-07-21 11:48:39 +03:00
|
|
|
return pb->error ? pb->error : AVERROR(EIO);
|
2007-06-05 01:10:54 +03:00
|
|
|
}
|
2012-07-21 11:48:39 +03:00
|
|
|
return AVERROR_EOF;
|
2007-06-05 01:10:54 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
/* get the length of the EBML number */
|
2010-09-02 22:17:46 +03:00
|
|
|
read = 8 - ff_log2_tab[total];
|
2007-06-05 01:10:54 +03:00
|
|
|
if (read > max_size) {
|
2011-03-03 21:11:45 +02:00
|
|
|
int64_t pos = avio_tell(pb) - 1;
|
2007-06-05 01:10:54 +03:00
|
|
|
av_log(matroska->ctx, AV_LOG_ERROR,
|
|
|
|
"Invalid EBML number size tag 0x%02x at pos %"PRIu64" (0x%"PRIx64")\n",
|
|
|
|
(uint8_t) total, pos, pos);
|
|
|
|
return AVERROR_INVALIDDATA;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* read out length */
|
2010-09-02 22:17:46 +03:00
|
|
|
total ^= 1 << ff_log2_tab[total];
|
2007-06-05 01:10:54 +03:00
|
|
|
while (n++ < read)
|
2011-02-21 17:43:01 +02:00
|
|
|
total = (total << 8) | avio_r8(pb);
|
2007-06-05 01:10:54 +03:00
|
|
|
|
|
|
|
*number = total;
|
|
|
|
|
|
|
|
return read;
|
|
|
|
}
|
|
|
|
|
2010-09-06 20:51:44 +03:00
|
|
|
/**
|
|
|
|
* Read a EBML length value.
|
|
|
|
* This needs special handling for the "unknown length" case which has multiple
|
|
|
|
* encodings.
|
|
|
|
*/
|
2011-02-20 12:04:12 +02:00
|
|
|
static int ebml_read_length(MatroskaDemuxContext *matroska, AVIOContext *pb,
|
2010-09-06 20:51:44 +03:00
|
|
|
uint64_t *number)
|
|
|
|
{
|
|
|
|
int res = ebml_read_num(matroska, pb, 8, number);
|
|
|
|
if (res > 0 && *number + 1 == 1ULL << (7 * res))
|
|
|
|
*number = 0xffffffffffffffULL;
|
|
|
|
return res;
|
|
|
|
}
|
|
|
|
|
2007-06-05 01:10:54 +03:00
|
|
|
/*
|
|
|
|
* Read the next element as an unsigned int.
|
|
|
|
* 0 is success, < 0 is failure.
|
|
|
|
*/
|
2011-02-20 12:04:12 +02:00
|
|
|
static int ebml_read_uint(AVIOContext *pb, int size, uint64_t *num)
|
2007-06-05 01:10:54 +03:00
|
|
|
{
|
2008-08-05 03:41:55 +03:00
|
|
|
int n = 0;
|
2007-06-05 01:10:54 +03:00
|
|
|
|
2010-09-06 00:37:40 +03:00
|
|
|
if (size > 8)
|
2007-06-05 01:10:54 +03:00
|
|
|
return AVERROR_INVALIDDATA;
|
|
|
|
|
2008-08-05 11:28:57 +03:00
|
|
|
/* big-endian ordering; build up number */
|
2007-06-05 01:10:54 +03:00
|
|
|
*num = 0;
|
|
|
|
while (n++ < size)
|
2011-02-21 17:43:01 +02:00
|
|
|
*num = (*num << 8) | avio_r8(pb);
|
2007-06-05 01:10:54 +03:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2013-11-15 21:00:37 +03:00
|
|
|
/*
|
|
|
|
* Read the next element as a signed int.
|
|
|
|
* 0 is success, < 0 is failure.
|
|
|
|
*/
|
|
|
|
static int ebml_read_sint(AVIOContext *pb, int size, int64_t *num)
|
|
|
|
{
|
|
|
|
int n = 1;
|
|
|
|
|
|
|
|
if (size > 8)
|
|
|
|
return AVERROR_INVALIDDATA;
|
|
|
|
|
|
|
|
if (size == 0) {
|
|
|
|
*num = 0;
|
|
|
|
} else {
|
2013-11-15 23:30:30 +03:00
|
|
|
*num = sign_extend(avio_r8(pb), 8);
|
2013-11-15 21:00:37 +03:00
|
|
|
|
|
|
|
/* big-endian ordering; build up number */
|
|
|
|
while (n++ < size)
|
|
|
|
*num = (*num << 8) | avio_r8(pb);
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2007-06-05 01:10:54 +03:00
|
|
|
/*
|
|
|
|
* Read the next element as a float.
|
|
|
|
* 0 is success, < 0 is failure.
|
|
|
|
*/
|
2011-02-20 12:04:12 +02:00
|
|
|
static int ebml_read_float(AVIOContext *pb, int size, double *num)
|
2007-06-05 01:10:54 +03:00
|
|
|
{
|
2010-09-06 00:37:40 +03:00
|
|
|
if (size == 0) {
|
|
|
|
*num = 0;
|
|
|
|
} else if (size == 4) {
|
2011-11-27 17:04:16 +03:00
|
|
|
*num = av_int2float(avio_rb32(pb));
|
|
|
|
} else if (size == 8){
|
|
|
|
*num = av_int2double(avio_rb64(pb));
|
2008-08-05 03:41:52 +03:00
|
|
|
} else
|
2007-06-05 01:10:54 +03:00
|
|
|
return AVERROR_INVALIDDATA;
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Read the next element as an ASCII string.
|
|
|
|
* 0 is success, < 0 is failure.
|
|
|
|
*/
|
2011-02-20 12:04:12 +02:00
|
|
|
static int ebml_read_ascii(AVIOContext *pb, int size, char **str)
|
2007-06-05 01:10:54 +03:00
|
|
|
{
|
2012-02-25 03:12:18 +03:00
|
|
|
char *res;
|
|
|
|
|
2008-08-05 11:28:57 +03:00
|
|
|
/* EBML strings are usually not 0-terminated, so we allocate one
|
2007-06-05 01:10:54 +03:00
|
|
|
* byte more, read the string and NULL-terminate it ourselves. */
|
2012-02-25 03:12:18 +03:00
|
|
|
if (!(res = av_malloc(size + 1)))
|
2007-07-19 18:21:30 +03:00
|
|
|
return AVERROR(ENOMEM);
|
2012-02-25 03:12:18 +03:00
|
|
|
if (avio_read(pb, (uint8_t *) res, size) != size) {
|
|
|
|
av_free(res);
|
2007-07-19 18:23:32 +03:00
|
|
|
return AVERROR(EIO);
|
2007-06-05 01:10:54 +03:00
|
|
|
}
|
2012-02-25 03:12:18 +03:00
|
|
|
(res)[size] = '\0';
|
|
|
|
av_free(*str);
|
|
|
|
*str = res;
|
2007-06-05 01:10:54 +03:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2008-08-05 03:42:39 +03:00
|
|
|
/*
|
|
|
|
* Read the next element as binary data.
|
|
|
|
* 0 is success, < 0 is failure.
|
|
|
|
*/
|
2011-02-20 12:04:12 +02:00
|
|
|
static int ebml_read_binary(AVIOContext *pb, int length, EbmlBin *bin)
|
2008-08-05 03:42:39 +03:00
|
|
|
{
|
2012-11-10 00:58:10 +03:00
|
|
|
av_fast_padded_malloc(&bin->data, &bin->size, length);
|
|
|
|
if (!bin->data)
|
2008-08-05 03:42:39 +03:00
|
|
|
return AVERROR(ENOMEM);
|
|
|
|
|
|
|
|
bin->size = length;
|
2011-03-03 21:11:45 +02:00
|
|
|
bin->pos = avio_tell(pb);
|
2011-02-21 17:43:01 +02:00
|
|
|
if (avio_read(pb, bin->data, length) != length) {
|
2010-05-19 00:21:37 +03:00
|
|
|
av_freep(&bin->data);
|
2012-12-04 05:30:40 +03:00
|
|
|
bin->size = 0;
|
2008-08-05 03:42:39 +03:00
|
|
|
return AVERROR(EIO);
|
2010-05-19 00:21:37 +03:00
|
|
|
}
|
2008-08-05 03:42:39 +03:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2007-06-05 01:10:54 +03:00
|
|
|
/*
|
|
|
|
* Read the next element, but only the header. The contents
|
|
|
|
* are supposed to be sub-elements which can be read separately.
|
|
|
|
* 0 is success, < 0 is failure.
|
|
|
|
*/
|
2010-06-11 20:16:43 +03:00
|
|
|
static int ebml_read_master(MatroskaDemuxContext *matroska, uint64_t length)
|
2007-06-05 01:10:54 +03:00
|
|
|
{
|
2011-02-20 12:04:12 +02:00
|
|
|
AVIOContext *pb = matroska->ctx->pb;
|
2007-06-05 01:10:54 +03:00
|
|
|
MatroskaLevel *level;
|
|
|
|
|
|
|
|
if (matroska->num_levels >= EBML_MAX_DEPTH) {
|
|
|
|
av_log(matroska->ctx, AV_LOG_ERROR,
|
|
|
|
"File moves beyond max. allowed depth (%d)\n", EBML_MAX_DEPTH);
|
2007-07-19 18:38:33 +03:00
|
|
|
return AVERROR(ENOSYS);
|
2007-06-05 01:10:54 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
level = &matroska->levels[matroska->num_levels++];
|
2011-03-03 21:11:45 +02:00
|
|
|
level->start = avio_tell(pb);
|
2007-06-05 01:10:54 +03:00
|
|
|
level->length = length;
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Read signed/unsigned "EBML" numbers.
|
2008-08-05 11:28:57 +03:00
|
|
|
* Return: number of bytes processed, < 0 on error
|
2007-06-05 01:10:54 +03:00
|
|
|
*/
|
2008-08-05 03:42:52 +03:00
|
|
|
static int matroska_ebmlnum_uint(MatroskaDemuxContext *matroska,
|
|
|
|
uint8_t *data, uint32_t size, uint64_t *num)
|
2007-06-05 01:10:54 +03:00
|
|
|
{
|
2011-02-20 12:04:12 +02:00
|
|
|
AVIOContext pb;
|
2011-02-20 12:04:13 +02:00
|
|
|
ffio_init_context(&pb, data, size, 0, NULL, NULL, NULL, NULL);
|
2010-05-19 00:21:32 +03:00
|
|
|
return ebml_read_num(matroska, &pb, FFMIN(size, 8), num);
|
2007-06-05 01:10:54 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Same as above, but signed.
|
|
|
|
*/
|
2008-08-05 03:42:52 +03:00
|
|
|
static int matroska_ebmlnum_sint(MatroskaDemuxContext *matroska,
|
|
|
|
uint8_t *data, uint32_t size, int64_t *num)
|
2007-06-05 01:10:54 +03:00
|
|
|
{
|
|
|
|
uint64_t unum;
|
|
|
|
int res;
|
|
|
|
|
|
|
|
/* read as unsigned number first */
|
2008-08-05 03:42:52 +03:00
|
|
|
if ((res = matroska_ebmlnum_uint(matroska, data, size, &unum)) < 0)
|
2007-06-05 01:10:54 +03:00
|
|
|
return res;
|
|
|
|
|
|
|
|
/* make signed (weird way) */
|
2008-08-05 03:42:55 +03:00
|
|
|
*num = unum - ((1LL << (7*res - 1)) - 1);
|
2007-06-05 01:10:54 +03:00
|
|
|
|
|
|
|
return res;
|
|
|
|
}
|
|
|
|
|
2008-08-05 03:42:39 +03:00
|
|
|
static int ebml_parse_elem(MatroskaDemuxContext *matroska,
|
|
|
|
EbmlSyntax *syntax, void *data);
|
2007-06-05 01:10:54 +03:00
|
|
|
|
2008-08-05 03:42:39 +03:00
|
|
|
static int ebml_parse_id(MatroskaDemuxContext *matroska, EbmlSyntax *syntax,
|
|
|
|
uint32_t id, void *data)
|
2007-06-05 01:10:54 +03:00
|
|
|
{
|
|
|
|
int i;
|
2008-08-05 03:42:39 +03:00
|
|
|
for (i=0; syntax[i].id; i++)
|
|
|
|
if (id == syntax[i].id)
|
|
|
|
break;
|
2010-06-11 19:43:47 +03:00
|
|
|
if (!syntax[i].id && id == MATROSKA_ID_CLUSTER &&
|
|
|
|
matroska->num_levels > 0 &&
|
2010-06-11 20:16:43 +03:00
|
|
|
matroska->levels[matroska->num_levels-1].length == 0xffffffffffffff)
|
2010-06-11 19:43:47 +03:00
|
|
|
return 0; // we reached the end of an unknown size cluster
|
2012-07-07 18:15:27 +03:00
|
|
|
if (!syntax[i].id && id != EBML_ID_VOID && id != EBML_ID_CRC32) {
|
2008-08-05 03:42:39 +03:00
|
|
|
av_log(matroska->ctx, AV_LOG_INFO, "Unknown entry 0x%X\n", id);
|
2012-07-07 18:15:27 +03:00
|
|
|
if (matroska->ctx->error_recognition & AV_EF_EXPLODE)
|
|
|
|
return AVERROR_INVALIDDATA;
|
|
|
|
}
|
2008-08-05 03:42:39 +03:00
|
|
|
return ebml_parse_elem(matroska, &syntax[i], data);
|
2007-06-05 01:10:54 +03:00
|
|
|
}
|
|
|
|
|
2008-08-05 03:42:39 +03:00
|
|
|
static int ebml_parse(MatroskaDemuxContext *matroska, EbmlSyntax *syntax,
|
|
|
|
void *data)
|
2007-06-05 01:10:54 +03:00
|
|
|
{
|
2010-06-11 19:34:01 +03:00
|
|
|
if (!matroska->current_id) {
|
2010-06-11 19:45:38 +03:00
|
|
|
uint64_t id;
|
|
|
|
int res = ebml_read_num(matroska, matroska->ctx->pb, 4, &id);
|
|
|
|
if (res < 0)
|
|
|
|
return res;
|
|
|
|
matroska->current_id = id | 1 << 7*res;
|
2010-06-11 19:34:01 +03:00
|
|
|
}
|
|
|
|
return ebml_parse_id(matroska, syntax, matroska->current_id, data);
|
2007-06-05 01:10:54 +03:00
|
|
|
}
|
|
|
|
|
2008-08-05 03:42:39 +03:00
|
|
|
static int ebml_parse_nest(MatroskaDemuxContext *matroska, EbmlSyntax *syntax,
|
|
|
|
void *data)
|
2007-06-05 01:10:54 +03:00
|
|
|
{
|
2008-08-05 03:42:39 +03:00
|
|
|
int i, res = 0;
|
2007-06-05 01:10:54 +03:00
|
|
|
|
2008-08-05 03:42:39 +03:00
|
|
|
for (i=0; syntax[i].id; i++)
|
|
|
|
switch (syntax[i].type) {
|
|
|
|
case EBML_UINT:
|
|
|
|
*(uint64_t *)((char *)data+syntax[i].data_offset) = syntax[i].def.u;
|
|
|
|
break;
|
|
|
|
case EBML_FLOAT:
|
|
|
|
*(double *)((char *)data+syntax[i].data_offset) = syntax[i].def.f;
|
|
|
|
break;
|
|
|
|
case EBML_STR:
|
|
|
|
case EBML_UTF8:
|
2013-09-04 09:55:17 +03:00
|
|
|
// the default may be NULL
|
|
|
|
if (syntax[i].def.s) {
|
|
|
|
uint8_t **dst = (uint8_t**)((uint8_t*)data + syntax[i].data_offset);
|
|
|
|
*dst = av_strdup(syntax[i].def.s);
|
|
|
|
if (!*dst)
|
|
|
|
return AVERROR(ENOMEM);
|
|
|
|
}
|
2008-08-05 03:42:39 +03:00
|
|
|
break;
|
2007-12-29 20:32:47 +02:00
|
|
|
}
|
2007-06-05 01:10:54 +03:00
|
|
|
|
2008-08-05 03:42:39 +03:00
|
|
|
while (!res && !ebml_level_end(matroska))
|
|
|
|
res = ebml_parse(matroska, syntax, data);
|
2007-06-05 01:10:54 +03:00
|
|
|
|
2008-08-05 03:42:39 +03:00
|
|
|
return res;
|
2007-06-05 01:10:54 +03:00
|
|
|
}
|
|
|
|
|
2008-08-05 03:40:00 +03:00
|
|
|
static int ebml_parse_elem(MatroskaDemuxContext *matroska,
|
|
|
|
EbmlSyntax *syntax, void *data)
|
|
|
|
{
|
2011-02-06 12:32:03 +02:00
|
|
|
static const uint64_t max_lengths[EBML_TYPE_COUNT] = {
|
|
|
|
[EBML_UINT] = 8,
|
|
|
|
[EBML_FLOAT] = 8,
|
|
|
|
// max. 16 MB for strings
|
|
|
|
[EBML_STR] = 0x1000000,
|
|
|
|
[EBML_UTF8] = 0x1000000,
|
|
|
|
// max. 256 MB for binary data
|
|
|
|
[EBML_BIN] = 0x10000000,
|
|
|
|
// no limits for anything else
|
|
|
|
};
|
2011-02-20 12:04:12 +02:00
|
|
|
AVIOContext *pb = matroska->ctx->pb;
|
2008-08-05 03:40:00 +03:00
|
|
|
uint32_t id = syntax->id;
|
2008-08-05 03:41:55 +03:00
|
|
|
uint64_t length;
|
2008-08-05 03:40:00 +03:00
|
|
|
int res;
|
2013-09-11 13:13:44 +03:00
|
|
|
void *newelem;
|
2008-08-05 03:40:00 +03:00
|
|
|
|
|
|
|
data = (char *)data + syntax->data_offset;
|
|
|
|
if (syntax->list_elem_size) {
|
|
|
|
EbmlList *list = data;
|
2013-09-11 14:34:25 +03:00
|
|
|
newelem = av_realloc_array(list->elem, list->nb_elem+1, syntax->list_elem_size);
|
2013-09-11 13:13:44 +03:00
|
|
|
if (!newelem)
|
|
|
|
return AVERROR(ENOMEM);
|
|
|
|
list->elem = newelem;
|
2008-08-05 03:40:00 +03:00
|
|
|
data = (char*)list->elem + list->nb_elem*syntax->list_elem_size;
|
|
|
|
memset(data, 0, syntax->list_elem_size);
|
|
|
|
list->nb_elem++;
|
|
|
|
}
|
|
|
|
|
2010-06-11 19:34:01 +03:00
|
|
|
if (syntax->type != EBML_PASS && syntax->type != EBML_STOP) {
|
|
|
|
matroska->current_id = 0;
|
2010-09-06 20:51:44 +03:00
|
|
|
if ((res = ebml_read_length(matroska, pb, &length)) < 0)
|
2008-08-05 03:41:55 +03:00
|
|
|
return res;
|
2011-02-06 12:32:03 +02:00
|
|
|
if (max_lengths[syntax->type] && length > max_lengths[syntax->type]) {
|
|
|
|
av_log(matroska->ctx, AV_LOG_ERROR,
|
|
|
|
"Invalid length 0x%"PRIx64" > 0x%"PRIx64" for syntax element %i\n",
|
|
|
|
length, max_lengths[syntax->type], syntax->type);
|
|
|
|
return AVERROR_INVALIDDATA;
|
|
|
|
}
|
2010-06-11 19:34:01 +03:00
|
|
|
}
|
2008-08-05 03:41:55 +03:00
|
|
|
|
2008-08-05 03:40:00 +03:00
|
|
|
switch (syntax->type) {
|
2008-08-05 03:41:55 +03:00
|
|
|
case EBML_UINT: res = ebml_read_uint (pb, length, data); break;
|
2013-11-15 21:00:37 +03:00
|
|
|
case EBML_SINT: res = ebml_read_sint (pb, length, data); break;
|
2008-08-05 03:41:55 +03:00
|
|
|
case EBML_FLOAT: res = ebml_read_float (pb, length, data); break;
|
2008-08-05 03:40:00 +03:00
|
|
|
case EBML_STR:
|
2008-08-05 03:41:55 +03:00
|
|
|
case EBML_UTF8: res = ebml_read_ascii (pb, length, data); break;
|
2008-08-05 03:41:59 +03:00
|
|
|
case EBML_BIN: res = ebml_read_binary(pb, length, data); break;
|
2008-08-05 03:41:55 +03:00
|
|
|
case EBML_NEST: if ((res=ebml_read_master(matroska, length)) < 0)
|
2008-08-05 03:40:00 +03:00
|
|
|
return res;
|
|
|
|
if (id == MATROSKA_ID_SEGMENT)
|
2011-03-03 21:11:45 +02:00
|
|
|
matroska->segment_start = avio_tell(matroska->ctx->pb);
|
2008-08-05 03:42:23 +03:00
|
|
|
return ebml_parse_nest(matroska, syntax->def.n, data);
|
2008-08-05 03:42:20 +03:00
|
|
|
case EBML_PASS: return ebml_parse_id(matroska, syntax->def.n, id, data);
|
2010-06-11 19:36:51 +03:00
|
|
|
case EBML_STOP: return 1;
|
2012-08-04 03:27:51 +03:00
|
|
|
default:
|
|
|
|
if(ffio_limit(pb, length) != length)
|
|
|
|
return AVERROR(EIO);
|
|
|
|
return avio_skip(pb,length)<0 ? AVERROR(EIO) : 0;
|
2008-08-05 03:40:00 +03:00
|
|
|
}
|
2008-08-05 03:41:52 +03:00
|
|
|
if (res == AVERROR_INVALIDDATA)
|
|
|
|
av_log(matroska->ctx, AV_LOG_ERROR, "Invalid element\n");
|
|
|
|
else if (res == AVERROR(EIO))
|
|
|
|
av_log(matroska->ctx, AV_LOG_ERROR, "Read error\n");
|
|
|
|
return res;
|
2008-08-05 03:40:00 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
static void ebml_free(EbmlSyntax *syntax, void *data)
|
|
|
|
{
|
|
|
|
int i, j;
|
|
|
|
for (i=0; syntax[i].id; i++) {
|
|
|
|
void *data_off = (char *)data + syntax[i].data_offset;
|
|
|
|
switch (syntax[i].type) {
|
|
|
|
case EBML_STR:
|
|
|
|
case EBML_UTF8: av_freep(data_off); break;
|
|
|
|
case EBML_BIN: av_freep(&((EbmlBin *)data_off)->data); break;
|
|
|
|
case EBML_NEST:
|
|
|
|
if (syntax[i].list_elem_size) {
|
|
|
|
EbmlList *list = data_off;
|
|
|
|
char *ptr = list->elem;
|
|
|
|
for (j=0; j<list->nb_elem; j++, ptr+=syntax[i].list_elem_size)
|
|
|
|
ebml_free(syntax[i].def.n, ptr);
|
|
|
|
av_free(list->elem);
|
|
|
|
} else
|
|
|
|
ebml_free(syntax[i].def.n, data_off);
|
|
|
|
default: break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2008-08-05 03:42:39 +03:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Autodetecting...
|
|
|
|
*/
|
|
|
|
static int matroska_probe(AVProbeData *p)
|
|
|
|
{
|
|
|
|
uint64_t total = 0;
|
2010-05-22 04:41:32 +03:00
|
|
|
int len_mask = 0x80, size = 1, n = 1, i;
|
2008-08-05 03:42:39 +03:00
|
|
|
|
2008-08-05 11:28:57 +03:00
|
|
|
/* EBML header? */
|
2008-08-05 03:42:39 +03:00
|
|
|
if (AV_RB32(p->buf) != EBML_ID_HEADER)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
/* length of header */
|
|
|
|
total = p->buf[4];
|
|
|
|
while (size <= 8 && !(total & len_mask)) {
|
|
|
|
size++;
|
|
|
|
len_mask >>= 1;
|
|
|
|
}
|
|
|
|
if (size > 8)
|
|
|
|
return 0;
|
|
|
|
total &= (len_mask - 1);
|
|
|
|
while (n < size)
|
|
|
|
total = (total << 8) | p->buf[4 + n++];
|
|
|
|
|
2008-08-05 11:28:57 +03:00
|
|
|
/* Does the probe data contain the whole header? */
|
2008-08-05 03:42:39 +03:00
|
|
|
if (p->buf_size < 4 + size + total)
|
|
|
|
return 0;
|
|
|
|
|
2010-05-22 04:41:32 +03:00
|
|
|
/* The header should contain a known document type. For now,
|
2008-08-05 03:42:39 +03:00
|
|
|
* we don't parse the whole header but simply check for the
|
|
|
|
* availability of that array of characters inside the header.
|
|
|
|
* Not fully fool-proof, but good enough. */
|
2010-05-22 04:41:32 +03:00
|
|
|
for (i = 0; i < FF_ARRAY_ELEMS(matroska_doctypes); i++) {
|
|
|
|
int probelen = strlen(matroska_doctypes[i]);
|
2011-07-20 03:51:48 +03:00
|
|
|
if (total < probelen)
|
|
|
|
continue;
|
2010-05-22 04:41:32 +03:00
|
|
|
for (n = 4+size; n <= 4+size+total-probelen; n++)
|
|
|
|
if (!memcmp(p->buf+n, matroska_doctypes[i], probelen))
|
|
|
|
return AVPROBE_SCORE_MAX;
|
|
|
|
}
|
2008-08-05 03:42:39 +03:00
|
|
|
|
2010-05-22 04:41:35 +03:00
|
|
|
// probably valid EBML header but no recognized doctype
|
2013-03-25 18:12:51 +03:00
|
|
|
return AVPROBE_SCORE_EXTENSION;
|
2008-08-05 03:42:39 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
static MatroskaTrack *matroska_find_track_by_num(MatroskaDemuxContext *matroska,
|
|
|
|
int num)
|
|
|
|
{
|
|
|
|
MatroskaTrack *tracks = matroska->tracks.elem;
|
|
|
|
int i;
|
|
|
|
|
|
|
|
for (i=0; i < matroska->tracks.nb_elem; i++)
|
|
|
|
if (tracks[i].num == num)
|
|
|
|
return &tracks[i];
|
|
|
|
|
|
|
|
av_log(matroska->ctx, AV_LOG_ERROR, "Invalid track number %d\n", num);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2008-08-05 03:42:05 +03:00
|
|
|
static int matroska_decode_buffer(uint8_t** buf, int* buf_size,
|
|
|
|
MatroskaTrack *track)
|
2008-06-22 18:49:44 +03:00
|
|
|
{
|
2008-08-05 03:40:31 +03:00
|
|
|
MatroskaTrackEncoding *encodings = track->encodings.elem;
|
2008-06-22 18:49:44 +03:00
|
|
|
uint8_t* data = *buf;
|
|
|
|
int isize = *buf_size;
|
|
|
|
uint8_t* pkt_data = NULL;
|
2012-02-12 12:58:46 +03:00
|
|
|
uint8_t av_unused *newpktdata;
|
2008-06-22 18:49:44 +03:00
|
|
|
int pkt_size = isize;
|
|
|
|
int result = 0;
|
|
|
|
int olen;
|
|
|
|
|
2012-06-15 02:29:30 +03:00
|
|
|
if (pkt_size >= 10000000U)
|
2012-09-14 21:03:37 +03:00
|
|
|
return AVERROR_INVALIDDATA;
|
2010-08-17 17:05:23 +03:00
|
|
|
|
2008-08-05 03:40:31 +03:00
|
|
|
switch (encodings[0].compression.algo) {
|
2012-09-14 19:51:49 +03:00
|
|
|
case MATROSKA_TRACK_ENCODING_COMP_HEADERSTRIP: {
|
|
|
|
int header_size = encodings[0].compression.settings.size;
|
|
|
|
uint8_t *header = encodings[0].compression.settings.data;
|
|
|
|
|
2012-09-20 14:30:44 +03:00
|
|
|
if (header_size && !header) {
|
2012-11-23 20:10:02 +03:00
|
|
|
av_log(NULL, AV_LOG_ERROR, "Compression size but no data in headerstrip\n");
|
2012-04-17 18:12:22 +03:00
|
|
|
return -1;
|
|
|
|
}
|
2012-09-20 14:30:44 +03:00
|
|
|
|
2012-09-14 19:51:49 +03:00
|
|
|
if (!header_size)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
pkt_size = isize + header_size;
|
|
|
|
pkt_data = av_malloc(pkt_size);
|
|
|
|
if (!pkt_data)
|
|
|
|
return AVERROR(ENOMEM);
|
|
|
|
|
|
|
|
memcpy(pkt_data, header, header_size);
|
|
|
|
memcpy(pkt_data + header_size, data, isize);
|
|
|
|
break;
|
|
|
|
}
|
2012-10-18 20:48:27 +03:00
|
|
|
#if CONFIG_LZO
|
2008-06-22 18:49:44 +03:00
|
|
|
case MATROSKA_TRACK_ENCODING_COMP_LZO:
|
|
|
|
do {
|
|
|
|
olen = pkt_size *= 3;
|
2012-09-14 19:39:58 +03:00
|
|
|
newpktdata = av_realloc(pkt_data, pkt_size + AV_LZO_OUTPUT_PADDING);
|
|
|
|
if (!newpktdata) {
|
2012-09-14 21:03:37 +03:00
|
|
|
result = AVERROR(ENOMEM);
|
2012-09-14 19:39:58 +03:00
|
|
|
goto failed;
|
|
|
|
}
|
|
|
|
pkt_data = newpktdata;
|
2009-02-02 22:16:00 +02:00
|
|
|
result = av_lzo1x_decode(pkt_data, &olen, data, &isize);
|
|
|
|
} while (result==AV_LZO_OUTPUT_FULL && pkt_size<10000000);
|
2012-09-14 21:03:37 +03:00
|
|
|
if (result) {
|
|
|
|
result = AVERROR_INVALIDDATA;
|
2008-06-22 18:49:44 +03:00
|
|
|
goto failed;
|
2012-09-14 21:03:37 +03:00
|
|
|
}
|
2008-06-22 18:49:44 +03:00
|
|
|
pkt_size -= olen;
|
|
|
|
break;
|
2012-10-18 20:48:27 +03:00
|
|
|
#endif
|
2009-01-14 01:44:16 +02:00
|
|
|
#if CONFIG_ZLIB
|
2008-06-22 18:49:44 +03:00
|
|
|
case MATROSKA_TRACK_ENCODING_COMP_ZLIB: {
|
|
|
|
z_stream zstream = {0};
|
|
|
|
if (inflateInit(&zstream) != Z_OK)
|
|
|
|
return -1;
|
|
|
|
zstream.next_in = data;
|
|
|
|
zstream.avail_in = isize;
|
|
|
|
do {
|
|
|
|
pkt_size *= 3;
|
2011-07-28 15:59:54 +03:00
|
|
|
newpktdata = av_realloc(pkt_data, pkt_size);
|
|
|
|
if (!newpktdata) {
|
|
|
|
inflateEnd(&zstream);
|
|
|
|
goto failed;
|
|
|
|
}
|
|
|
|
pkt_data = newpktdata;
|
2008-06-22 18:49:44 +03:00
|
|
|
zstream.avail_out = pkt_size - zstream.total_out;
|
|
|
|
zstream.next_out = pkt_data + zstream.total_out;
|
2011-07-28 15:59:54 +03:00
|
|
|
if (pkt_data) {
|
|
|
|
result = inflate(&zstream, Z_NO_FLUSH);
|
|
|
|
} else
|
|
|
|
result = Z_MEM_ERROR;
|
2008-06-22 18:49:44 +03:00
|
|
|
} while (result==Z_OK && pkt_size<10000000);
|
|
|
|
pkt_size = zstream.total_out;
|
|
|
|
inflateEnd(&zstream);
|
2012-09-14 21:03:37 +03:00
|
|
|
if (result != Z_STREAM_END) {
|
|
|
|
if (result == Z_MEM_ERROR)
|
|
|
|
result = AVERROR(ENOMEM);
|
|
|
|
else
|
|
|
|
result = AVERROR_INVALIDDATA;
|
2008-06-22 18:49:44 +03:00
|
|
|
goto failed;
|
2012-09-14 21:03:37 +03:00
|
|
|
}
|
2008-06-22 18:49:44 +03:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
#endif
|
2009-01-14 01:44:16 +02:00
|
|
|
#if CONFIG_BZLIB
|
2008-06-22 18:49:44 +03:00
|
|
|
case MATROSKA_TRACK_ENCODING_COMP_BZLIB: {
|
|
|
|
bz_stream bzstream = {0};
|
|
|
|
if (BZ2_bzDecompressInit(&bzstream, 0, 0) != BZ_OK)
|
|
|
|
return -1;
|
|
|
|
bzstream.next_in = data;
|
|
|
|
bzstream.avail_in = isize;
|
|
|
|
do {
|
|
|
|
pkt_size *= 3;
|
2011-07-28 15:59:54 +03:00
|
|
|
newpktdata = av_realloc(pkt_data, pkt_size);
|
|
|
|
if (!newpktdata) {
|
|
|
|
BZ2_bzDecompressEnd(&bzstream);
|
|
|
|
goto failed;
|
|
|
|
}
|
|
|
|
pkt_data = newpktdata;
|
2008-06-22 18:49:44 +03:00
|
|
|
bzstream.avail_out = pkt_size - bzstream.total_out_lo32;
|
|
|
|
bzstream.next_out = pkt_data + bzstream.total_out_lo32;
|
2011-07-28 15:59:54 +03:00
|
|
|
if (pkt_data) {
|
|
|
|
result = BZ2_bzDecompress(&bzstream);
|
|
|
|
} else
|
|
|
|
result = BZ_MEM_ERROR;
|
2008-06-22 18:49:44 +03:00
|
|
|
} while (result==BZ_OK && pkt_size<10000000);
|
|
|
|
pkt_size = bzstream.total_out_lo32;
|
|
|
|
BZ2_bzDecompressEnd(&bzstream);
|
2012-09-14 21:03:37 +03:00
|
|
|
if (result != BZ_STREAM_END) {
|
|
|
|
if (result == BZ_MEM_ERROR)
|
|
|
|
result = AVERROR(ENOMEM);
|
|
|
|
else
|
|
|
|
result = AVERROR_INVALIDDATA;
|
2008-06-22 18:49:44 +03:00
|
|
|
goto failed;
|
2012-09-14 21:03:37 +03:00
|
|
|
}
|
2008-06-22 18:49:44 +03:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
#endif
|
2008-08-21 02:08:07 +03:00
|
|
|
default:
|
2012-09-14 21:03:37 +03:00
|
|
|
return AVERROR_INVALIDDATA;
|
2008-06-22 18:49:44 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
*buf = pkt_data;
|
|
|
|
*buf_size = pkt_size;
|
|
|
|
return 0;
|
|
|
|
failed:
|
|
|
|
av_free(pkt_data);
|
2012-09-14 21:03:37 +03:00
|
|
|
return result;
|
2008-06-22 18:49:44 +03:00
|
|
|
}
|
|
|
|
|
subtitles: introduce ASS codec id and use it.
Currently, we have a AV_CODEC_ID_SSA, which matches the way the ASS/SSA
markup is muxed in a standalone .ass/.ssa file. This means the AVPacket
data starts with a "Dialogue:" string, followed by a timing information
(start and end of the event as string) and a trailing CRLF after each
line. One packet can contain several lines. We'll refer to this layout
as "SSA" or "SSA lines".
In matroska, this markup is not stored as such: it has no "Dialogue:"
prefix, it contains a ReadOrder field, the timing information is not in
the payload, and it doesn't contain the trailing CRLF. See [1] for more
info. We'll refer to this layout as "ASS".
Since we have only one common codec for both formats, the matroska
demuxer is constructing an AVPacket following the "SSA lines" format.
This causes several problems, so it was decided to change this into
clean ASS packets.
Some insight about what is changed or unchanged in this commit:
CODECS
------
- the decoding process still writes "SSA lines" markup inside the ass
fields of the subtitles rectangles (sub->rects[n]->ass), which is
still the current common way of representing decoded subtitles
markup. It is meant to change later.
- new ASS codec id: AV_CODEC_ID_ASS (which is different from the
legacy AV_CODEC_ID_SSA)
- lavc/assdec: the "ass" decoder is renamed into "ssa" (instead of
"ass") for consistency with the codec id and allows to add a real
ass decoder. This ass decoder receives clean ASS lines (so it starts
with a ReadOrder, is followed by the Layer, etc). We make sure this
is decoded properly in a new ass-line rectangle of the decoded
subtitles (the ssa decoder OTOH is doing a simple straightforward
copy). Using the packet timing instead of data string makes sure the
ass-line now contains the appropriate timing.
- lavc/assenc: just like the ass decoder, the "ssa" encoder is renamed
into "ssa" (instead of "ass") for consistency with the codec id, and
allows to add a real "ass" encoder.
One important thing about this encoder is that it only supports one
ass rectangle: we could have put several dialogue events in the
AVPacket (separated by a \0 for instance) but this would have cause
trouble for the muxer which needs not only the start time, but also
the duration: typically, you have merged events with the same start
time (stored in the AVPacket->pts) but a different duration. At the
moment, only the matroska do the merge with the SSA-line codec.
We will need to make sure all the decoders in the future can't add
more than one rectangle (and only one Dialogue line in it
obviously).
FORMATS
-------
- lavf/assenc: the .ass/.ssa muxer can take both SSA and ASS packets.
In the case of ASS packets as input, it adds the timing based on the
AVPacket pts and duration, and mux it with "Dialogue:", trailing
CRLF, etc.
- lavf/assdec: unchanged; it currently still only outputs SSA-lines
packets.
- lavf/mkv: the demuxer can now output ASS packets without the need of
any "SSA-lines" reconstruction hack. It will become the default at
next libavformat bump, and the SSA support will be dropped from the
demuxer. The muxer can take ASS packets since it's muxed normally,
and still supports the old SSA packets. All the SSA support and
hacks in Matroska code will be dropped at next lavf bump.
[1]: http://www.matroska.org/technical/specs/subtitles/ssa.html
2013-01-03 05:06:43 +03:00
|
|
|
#if FF_API_ASS_SSA
|
2008-09-05 02:26:12 +03:00
|
|
|
static void matroska_fix_ass_packet(MatroskaDemuxContext *matroska,
|
2008-09-29 01:55:28 +03:00
|
|
|
AVPacket *pkt, uint64_t display_duration)
|
2008-09-05 02:26:12 +03:00
|
|
|
{
|
2012-10-31 10:53:18 +03:00
|
|
|
AVBufferRef *line;
|
|
|
|
char *layer, *ptr = pkt->data, *end = ptr+pkt->size;
|
2008-09-05 02:26:12 +03:00
|
|
|
for (; *ptr!=',' && ptr<end-1; ptr++);
|
|
|
|
if (*ptr == ',')
|
2011-05-29 22:02:20 +03:00
|
|
|
ptr++;
|
|
|
|
layer = ptr;
|
2008-09-05 02:26:12 +03:00
|
|
|
for (; *ptr!=',' && ptr<end-1; ptr++);
|
|
|
|
if (*ptr == ',') {
|
2008-09-29 01:55:28 +03:00
|
|
|
int64_t end_pts = pkt->pts + display_duration;
|
2008-09-05 02:26:12 +03:00
|
|
|
int sc = matroska->time_scale * pkt->pts / 10000000;
|
|
|
|
int ec = matroska->time_scale * end_pts / 10000000;
|
|
|
|
int sh, sm, ss, eh, em, es, len;
|
|
|
|
sh = sc/360000; sc -= 360000*sh;
|
|
|
|
sm = sc/ 6000; sc -= 6000*sm;
|
|
|
|
ss = sc/ 100; sc -= 100*ss;
|
|
|
|
eh = ec/360000; ec -= 360000*eh;
|
|
|
|
em = ec/ 6000; ec -= 6000*em;
|
|
|
|
es = ec/ 100; ec -= 100*es;
|
|
|
|
*ptr++ = '\0';
|
|
|
|
len = 50 + end-ptr + FF_INPUT_BUFFER_PADDING_SIZE;
|
2012-10-31 10:53:18 +03:00
|
|
|
if (!(line = av_buffer_alloc(len)))
|
2008-09-05 02:26:12 +03:00
|
|
|
return;
|
2012-10-31 10:53:18 +03:00
|
|
|
snprintf(line->data, len,"Dialogue: %s,%d:%02d:%02d.%02d,%d:%02d:%02d.%02d,%s\r\n",
|
2008-09-05 02:26:12 +03:00
|
|
|
layer, sh, sm, ss, sc, eh, em, es, ec, ptr);
|
2012-10-31 10:53:18 +03:00
|
|
|
av_buffer_unref(&pkt->buf);
|
|
|
|
pkt->buf = line;
|
|
|
|
pkt->data = line->data;
|
|
|
|
pkt->size = strlen(line->data);
|
2008-09-05 02:26:12 +03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2011-07-28 15:59:54 +03:00
|
|
|
static int matroska_merge_packets(AVPacket *out, AVPacket *in)
|
2008-09-29 02:06:25 +03:00
|
|
|
{
|
2012-04-16 19:02:02 +03:00
|
|
|
int ret = av_grow_packet(out, in->size);
|
|
|
|
if (ret < 0)
|
|
|
|
return ret;
|
2012-11-01 08:34:41 +03:00
|
|
|
|
2012-04-16 19:02:02 +03:00
|
|
|
memcpy(out->data + out->size - in->size, in->data, in->size);
|
2012-11-01 08:34:41 +03:00
|
|
|
|
|
|
|
av_free_packet(in);
|
2008-09-29 02:06:25 +03:00
|
|
|
av_free(in);
|
2011-07-28 15:59:54 +03:00
|
|
|
return 0;
|
2008-09-29 02:06:25 +03:00
|
|
|
}
|
subtitles: introduce ASS codec id and use it.
Currently, we have a AV_CODEC_ID_SSA, which matches the way the ASS/SSA
markup is muxed in a standalone .ass/.ssa file. This means the AVPacket
data starts with a "Dialogue:" string, followed by a timing information
(start and end of the event as string) and a trailing CRLF after each
line. One packet can contain several lines. We'll refer to this layout
as "SSA" or "SSA lines".
In matroska, this markup is not stored as such: it has no "Dialogue:"
prefix, it contains a ReadOrder field, the timing information is not in
the payload, and it doesn't contain the trailing CRLF. See [1] for more
info. We'll refer to this layout as "ASS".
Since we have only one common codec for both formats, the matroska
demuxer is constructing an AVPacket following the "SSA lines" format.
This causes several problems, so it was decided to change this into
clean ASS packets.
Some insight about what is changed or unchanged in this commit:
CODECS
------
- the decoding process still writes "SSA lines" markup inside the ass
fields of the subtitles rectangles (sub->rects[n]->ass), which is
still the current common way of representing decoded subtitles
markup. It is meant to change later.
- new ASS codec id: AV_CODEC_ID_ASS (which is different from the
legacy AV_CODEC_ID_SSA)
- lavc/assdec: the "ass" decoder is renamed into "ssa" (instead of
"ass") for consistency with the codec id and allows to add a real
ass decoder. This ass decoder receives clean ASS lines (so it starts
with a ReadOrder, is followed by the Layer, etc). We make sure this
is decoded properly in a new ass-line rectangle of the decoded
subtitles (the ssa decoder OTOH is doing a simple straightforward
copy). Using the packet timing instead of data string makes sure the
ass-line now contains the appropriate timing.
- lavc/assenc: just like the ass decoder, the "ssa" encoder is renamed
into "ssa" (instead of "ass") for consistency with the codec id, and
allows to add a real "ass" encoder.
One important thing about this encoder is that it only supports one
ass rectangle: we could have put several dialogue events in the
AVPacket (separated by a \0 for instance) but this would have cause
trouble for the muxer which needs not only the start time, but also
the duration: typically, you have merged events with the same start
time (stored in the AVPacket->pts) but a different duration. At the
moment, only the matroska do the merge with the SSA-line codec.
We will need to make sure all the decoders in the future can't add
more than one rectangle (and only one Dialogue line in it
obviously).
FORMATS
-------
- lavf/assenc: the .ass/.ssa muxer can take both SSA and ASS packets.
In the case of ASS packets as input, it adds the timing based on the
AVPacket pts and duration, and mux it with "Dialogue:", trailing
CRLF, etc.
- lavf/assdec: unchanged; it currently still only outputs SSA-lines
packets.
- lavf/mkv: the demuxer can now output ASS packets without the need of
any "SSA-lines" reconstruction hack. It will become the default at
next libavformat bump, and the SSA support will be dropped from the
demuxer. The muxer can take ASS packets since it's muxed normally,
and still supports the old SSA packets. All the SSA support and
hacks in Matroska code will be dropped at next lavf bump.
[1]: http://www.matroska.org/technical/specs/subtitles/ssa.html
2013-01-03 05:06:43 +03:00
|
|
|
#endif
|
2008-09-29 02:06:25 +03:00
|
|
|
|
2009-02-15 17:53:55 +02:00
|
|
|
static void matroska_convert_tag(AVFormatContext *s, EbmlList *list,
|
2011-05-22 13:46:29 +03:00
|
|
|
AVDictionary **metadata, char *prefix)
|
2008-08-09 02:50:38 +03:00
|
|
|
{
|
|
|
|
MatroskaTag *tags = list->elem;
|
2009-02-15 17:53:55 +02:00
|
|
|
char key[1024];
|
|
|
|
int i;
|
2008-08-09 02:50:38 +03:00
|
|
|
|
|
|
|
for (i=0; i < list->nb_elem; i++) {
|
2013-09-03 12:10:50 +03:00
|
|
|
const char *lang = tags[i].lang && strcmp(tags[i].lang, "und") ?
|
|
|
|
tags[i].lang : NULL;
|
2010-11-03 08:29:04 +02:00
|
|
|
|
|
|
|
if (!tags[i].name) {
|
|
|
|
av_log(s, AV_LOG_WARNING, "Skipping invalid tag with no TagName.\n");
|
|
|
|
continue;
|
|
|
|
}
|
2009-02-15 17:53:55 +02:00
|
|
|
if (prefix) snprintf(key, sizeof(key), "%s/%s", prefix, tags[i].name);
|
|
|
|
else av_strlcpy(key, tags[i].name, sizeof(key));
|
2009-02-15 18:05:37 +02:00
|
|
|
if (tags[i].def || !lang) {
|
2011-05-22 13:46:29 +03:00
|
|
|
av_dict_set(metadata, key, tags[i].string, 0);
|
2008-08-09 02:50:38 +03:00
|
|
|
if (tags[i].sub.nb_elem)
|
2009-02-15 17:53:55 +02:00
|
|
|
matroska_convert_tag(s, &tags[i].sub, metadata, key);
|
2009-02-15 18:05:37 +02:00
|
|
|
}
|
|
|
|
if (lang) {
|
|
|
|
av_strlcat(key, "-", sizeof(key));
|
|
|
|
av_strlcat(key, lang, sizeof(key));
|
2011-05-22 13:46:29 +03:00
|
|
|
av_dict_set(metadata, key, tags[i].string, 0);
|
2009-02-15 18:05:37 +02:00
|
|
|
if (tags[i].sub.nb_elem)
|
|
|
|
matroska_convert_tag(s, &tags[i].sub, metadata, key);
|
|
|
|
}
|
2009-02-15 17:53:55 +02:00
|
|
|
}
|
2010-10-16 16:20:41 +03:00
|
|
|
ff_metadata_conv(metadata, NULL, ff_mkv_metadata_conv);
|
2009-02-15 17:53:55 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
static void matroska_convert_tags(AVFormatContext *s)
|
|
|
|
{
|
|
|
|
MatroskaDemuxContext *matroska = s->priv_data;
|
|
|
|
MatroskaTags *tags = matroska->tags.elem;
|
|
|
|
int i, j;
|
|
|
|
|
|
|
|
for (i=0; i < matroska->tags.nb_elem; i++) {
|
|
|
|
if (tags[i].target.attachuid) {
|
|
|
|
MatroskaAttachement *attachment = matroska->attachments.elem;
|
|
|
|
for (j=0; j<matroska->attachments.nb_elem; j++)
|
2011-03-24 01:28:19 +02:00
|
|
|
if (attachment[j].uid == tags[i].target.attachuid
|
|
|
|
&& attachment[j].stream)
|
2009-02-15 17:53:55 +02:00
|
|
|
matroska_convert_tag(s, &tags[i].tag,
|
|
|
|
&attachment[j].stream->metadata, NULL);
|
|
|
|
} else if (tags[i].target.chapteruid) {
|
|
|
|
MatroskaChapter *chapter = matroska->chapters.elem;
|
|
|
|
for (j=0; j<matroska->chapters.nb_elem; j++)
|
2011-03-24 01:28:19 +02:00
|
|
|
if (chapter[j].uid == tags[i].target.chapteruid
|
|
|
|
&& chapter[j].chapter)
|
2009-02-15 17:53:55 +02:00
|
|
|
matroska_convert_tag(s, &tags[i].tag,
|
|
|
|
&chapter[j].chapter->metadata, NULL);
|
|
|
|
} else if (tags[i].target.trackuid) {
|
|
|
|
MatroskaTrack *track = matroska->tracks.elem;
|
|
|
|
for (j=0; j<matroska->tracks.nb_elem; j++)
|
2011-03-24 01:28:19 +02:00
|
|
|
if (track[j].uid == tags[i].target.trackuid && track[j].stream)
|
2009-02-15 17:53:55 +02:00
|
|
|
matroska_convert_tag(s, &tags[i].tag,
|
|
|
|
&track[j].stream->metadata, NULL);
|
|
|
|
} else {
|
2009-06-14 01:29:38 +03:00
|
|
|
matroska_convert_tag(s, &tags[i].tag, &s->metadata,
|
|
|
|
tags[i].target.type);
|
2009-02-15 17:53:55 +02:00
|
|
|
}
|
2008-08-09 02:50:38 +03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2011-07-09 08:48:43 +03:00
|
|
|
static int matroska_parse_seekhead_entry(MatroskaDemuxContext *matroska, int idx)
|
2008-08-05 03:40:36 +03:00
|
|
|
{
|
|
|
|
EbmlList *seekhead_list = &matroska->seekhead;
|
|
|
|
MatroskaSeekhead *seekhead = seekhead_list->elem;
|
|
|
|
uint32_t level_up = matroska->level_up;
|
2011-03-03 21:11:45 +02:00
|
|
|
int64_t before_pos = avio_tell(matroska->ctx->pb);
|
2010-06-11 19:34:01 +03:00
|
|
|
uint32_t saved_id = matroska->current_id;
|
2008-08-05 03:40:36 +03:00
|
|
|
MatroskaLevel level;
|
2011-07-09 08:48:43 +03:00
|
|
|
int64_t offset;
|
|
|
|
int ret = 0;
|
2008-08-05 03:42:33 +03:00
|
|
|
|
2011-07-09 08:48:43 +03:00
|
|
|
if (idx >= seekhead_list->nb_elem
|
|
|
|
|| seekhead[idx].id == MATROSKA_ID_SEEKHEAD
|
|
|
|
|| seekhead[idx].id == MATROSKA_ID_CLUSTER)
|
|
|
|
return 0;
|
2007-06-05 01:10:54 +03:00
|
|
|
|
2011-07-09 09:11:30 +03:00
|
|
|
/* seek */
|
2011-07-09 08:48:43 +03:00
|
|
|
offset = seekhead[idx].pos + matroska->segment_start;
|
|
|
|
if (avio_seek(matroska->ctx->pb, offset, SEEK_SET) == offset) {
|
2008-08-05 11:28:57 +03:00
|
|
|
/* We don't want to lose our seekhead level, so we add
|
2008-08-05 03:40:43 +03:00
|
|
|
* a dummy. This is a crude hack. */
|
|
|
|
if (matroska->num_levels == EBML_MAX_DEPTH) {
|
|
|
|
av_log(matroska->ctx, AV_LOG_INFO,
|
|
|
|
"Max EBML element depth (%d) reached, "
|
|
|
|
"cannot parse further.\n", EBML_MAX_DEPTH);
|
2011-07-09 08:48:43 +03:00
|
|
|
ret = AVERROR_INVALIDDATA;
|
|
|
|
} else {
|
2011-07-09 09:11:30 +03:00
|
|
|
level.start = 0;
|
|
|
|
level.length = (uint64_t)-1;
|
|
|
|
matroska->levels[matroska->num_levels] = level;
|
|
|
|
matroska->num_levels++;
|
|
|
|
matroska->current_id = 0;
|
|
|
|
|
2011-09-09 01:43:32 +03:00
|
|
|
ret = ebml_parse(matroska, matroska_segment, matroska);
|
2011-07-09 09:11:30 +03:00
|
|
|
|
|
|
|
/* remove dummy level */
|
|
|
|
while (matroska->num_levels) {
|
|
|
|
uint64_t length = matroska->levels[--matroska->num_levels].length;
|
|
|
|
if (length == (uint64_t)-1)
|
|
|
|
break;
|
|
|
|
}
|
2008-08-05 03:40:43 +03:00
|
|
|
}
|
2008-08-05 03:40:36 +03:00
|
|
|
}
|
2008-08-05 03:40:43 +03:00
|
|
|
/* seek back */
|
2011-02-28 15:57:54 +02:00
|
|
|
avio_seek(matroska->ctx->pb, before_pos, SEEK_SET);
|
2008-08-05 03:40:43 +03:00
|
|
|
matroska->level_up = level_up;
|
2010-06-11 19:34:01 +03:00
|
|
|
matroska->current_id = saved_id;
|
2011-07-09 08:48:43 +03:00
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void matroska_execute_seekhead(MatroskaDemuxContext *matroska)
|
|
|
|
{
|
|
|
|
EbmlList *seekhead_list = &matroska->seekhead;
|
|
|
|
int64_t before_pos = avio_tell(matroska->ctx->pb);
|
2008-08-05 03:41:01 +03:00
|
|
|
int i;
|
2007-06-05 01:10:54 +03:00
|
|
|
|
2010-06-08 22:31:08 +03:00
|
|
|
// we should not do any seeking in the streaming case
|
2011-03-05 22:06:46 +02:00
|
|
|
if (!matroska->ctx->pb->seekable ||
|
2010-06-08 22:31:08 +03:00
|
|
|
(matroska->ctx->flags & AVFMT_FLAG_IGNIDX))
|
|
|
|
return;
|
|
|
|
|
2011-07-09 08:48:43 +03:00
|
|
|
for (i = 0; i < seekhead_list->nb_elem; i++) {
|
2012-01-04 18:33:34 +03:00
|
|
|
MatroskaSeekhead *seekhead = seekhead_list->elem;
|
2011-07-09 08:48:43 +03:00
|
|
|
if (seekhead[i].pos <= before_pos)
|
2008-08-05 03:40:36 +03:00
|
|
|
continue;
|
2007-06-05 01:10:54 +03:00
|
|
|
|
2011-07-09 08:48:43 +03:00
|
|
|
// defer cues parsing until we actually need cue data.
|
|
|
|
if (seekhead[i].id == MATROSKA_ID_CUES) {
|
|
|
|
matroska->cues_parsing_deferred = 1;
|
2008-08-05 03:40:43 +03:00
|
|
|
continue;
|
2011-07-09 08:48:43 +03:00
|
|
|
}
|
2008-08-05 03:40:43 +03:00
|
|
|
|
2012-02-12 16:09:03 +03:00
|
|
|
if (matroska_parse_seekhead_entry(matroska, i) < 0) {
|
|
|
|
// mark index as broken
|
|
|
|
matroska->cues_parsing_deferred = -1;
|
2008-08-05 03:40:43 +03:00
|
|
|
break;
|
2012-02-12 16:09:03 +03:00
|
|
|
}
|
2011-07-09 08:48:43 +03:00
|
|
|
}
|
|
|
|
}
|
2008-08-05 03:40:43 +03:00
|
|
|
|
2011-09-22 17:51:00 +03:00
|
|
|
static void matroska_add_index_entries(MatroskaDemuxContext *matroska) {
|
2011-07-09 08:48:43 +03:00
|
|
|
EbmlList *index_list;
|
|
|
|
MatroskaIndex *index;
|
|
|
|
int index_scale = 1;
|
|
|
|
int i, j;
|
2008-08-05 03:40:43 +03:00
|
|
|
|
2011-07-09 08:48:43 +03:00
|
|
|
index_list = &matroska->index;
|
|
|
|
index = index_list->elem;
|
|
|
|
if (index_list->nb_elem
|
|
|
|
&& index[0].time > 1E14/matroska->time_scale) {
|
|
|
|
av_log(matroska->ctx, AV_LOG_WARNING, "Working around broken index.\n");
|
|
|
|
index_scale = matroska->time_scale;
|
|
|
|
}
|
|
|
|
for (i = 0; i < index_list->nb_elem; i++) {
|
|
|
|
EbmlList *pos_list = &index[i].pos;
|
|
|
|
MatroskaIndexPos *pos = pos_list->elem;
|
|
|
|
for (j = 0; j < pos_list->nb_elem; j++) {
|
|
|
|
MatroskaTrack *track = matroska_find_track_by_num(matroska, pos[j].track);
|
|
|
|
if (track && track->stream)
|
|
|
|
av_add_index_entry(track->stream,
|
|
|
|
pos[j].pos + matroska->segment_start,
|
|
|
|
index[i].time/index_scale, 0, 0,
|
|
|
|
AVINDEX_KEYFRAME);
|
2008-08-05 03:40:43 +03:00
|
|
|
}
|
2008-08-05 03:40:36 +03:00
|
|
|
}
|
2007-06-05 01:10:54 +03:00
|
|
|
}
|
|
|
|
|
2011-09-22 17:51:00 +03:00
|
|
|
static void matroska_parse_cues(MatroskaDemuxContext *matroska) {
|
|
|
|
EbmlList *seekhead_list = &matroska->seekhead;
|
|
|
|
MatroskaSeekhead *seekhead = seekhead_list->elem;
|
|
|
|
int i;
|
|
|
|
|
|
|
|
for (i = 0; i < seekhead_list->nb_elem; i++)
|
|
|
|
if (seekhead[i].id == MATROSKA_ID_CUES)
|
|
|
|
break;
|
2013-03-22 20:04:17 +03:00
|
|
|
av_assert1(i <= seekhead_list->nb_elem);
|
2011-09-22 17:51:00 +03:00
|
|
|
|
2012-02-12 16:09:03 +03:00
|
|
|
if (matroska_parse_seekhead_entry(matroska, i) < 0)
|
|
|
|
matroska->cues_parsing_deferred = -1;
|
2011-09-22 17:51:00 +03:00
|
|
|
matroska_add_index_entries(matroska);
|
|
|
|
}
|
|
|
|
|
2008-08-05 03:42:05 +03:00
|
|
|
static int matroska_aac_profile(char *codec_id)
|
2007-06-05 01:10:54 +03:00
|
|
|
{
|
2008-08-24 16:12:41 +03:00
|
|
|
static const char * const aac_profiles[] = { "MAIN", "LC", "SSR" };
|
2007-06-05 01:10:54 +03:00
|
|
|
int profile;
|
|
|
|
|
2008-10-22 00:40:24 +03:00
|
|
|
for (profile=0; profile<FF_ARRAY_ELEMS(aac_profiles); profile++)
|
2007-06-05 01:10:54 +03:00
|
|
|
if (strstr(codec_id, aac_profiles[profile]))
|
|
|
|
break;
|
|
|
|
return profile + 1;
|
|
|
|
}
|
|
|
|
|
2008-08-05 03:42:05 +03:00
|
|
|
static int matroska_aac_sri(int samplerate)
|
2007-06-05 01:10:54 +03:00
|
|
|
{
|
|
|
|
int sri;
|
|
|
|
|
2011-10-17 10:28:53 +03:00
|
|
|
for (sri=0; sri<FF_ARRAY_ELEMS(avpriv_mpeg4audio_sample_rates); sri++)
|
|
|
|
if (avpriv_mpeg4audio_sample_rates[sri] == samplerate)
|
2007-06-05 01:10:54 +03:00
|
|
|
break;
|
|
|
|
return sri;
|
|
|
|
}
|
|
|
|
|
2012-03-05 21:02:48 +03:00
|
|
|
static void matroska_metadata_creation_time(AVDictionary **metadata, int64_t date_utc)
|
|
|
|
{
|
|
|
|
char buffer[32];
|
|
|
|
/* Convert to seconds and adjust by number of seconds between 2001-01-01 and Epoch */
|
|
|
|
time_t creation_time = date_utc / 1000000000 + 978307200;
|
|
|
|
struct tm *ptm = gmtime(&creation_time);
|
|
|
|
if (!ptm) return;
|
|
|
|
strftime(buffer, sizeof(buffer), "%Y-%m-%d %H:%M:%S", ptm);
|
|
|
|
av_dict_set(metadata, "creation_time", buffer, 0);
|
|
|
|
}
|
|
|
|
|
2012-01-12 15:20:36 +03:00
|
|
|
static int matroska_read_header(AVFormatContext *s)
|
2007-06-05 01:10:54 +03:00
|
|
|
{
|
|
|
|
MatroskaDemuxContext *matroska = s->priv_data;
|
2008-08-05 03:40:55 +03:00
|
|
|
EbmlList *attachements_list = &matroska->attachments;
|
|
|
|
MatroskaAttachement *attachements;
|
|
|
|
EbmlList *chapters_list = &matroska->chapters;
|
|
|
|
MatroskaChapter *chapters;
|
2008-08-05 03:40:49 +03:00
|
|
|
MatroskaTrack *tracks;
|
2009-01-15 02:42:57 +02:00
|
|
|
uint64_t max_start = 0;
|
2012-02-14 01:06:19 +03:00
|
|
|
int64_t pos;
|
2008-08-05 03:40:02 +03:00
|
|
|
Ebml ebml = { 0 };
|
2008-08-05 03:40:49 +03:00
|
|
|
AVStream *st;
|
2011-05-24 02:09:24 +03:00
|
|
|
int i, j, k, res;
|
2007-06-05 01:10:54 +03:00
|
|
|
|
|
|
|
matroska->ctx = s;
|
|
|
|
|
|
|
|
/* First read the EBML header. */
|
2008-08-05 03:42:20 +03:00
|
|
|
if (ebml_parse(matroska, ebml_syntax, &ebml)
|
2008-08-05 03:40:02 +03:00
|
|
|
|| ebml.version > EBML_VERSION || ebml.max_size > sizeof(uint64_t)
|
2012-03-16 07:28:18 +03:00
|
|
|
|| ebml.id_length > sizeof(uint32_t) || ebml.doctype_version > 3 || !ebml.doctype) {
|
2007-06-05 01:10:54 +03:00
|
|
|
av_log(matroska->ctx, AV_LOG_ERROR,
|
2008-08-05 03:40:02 +03:00
|
|
|
"EBML header using unsupported features\n"
|
|
|
|
"(EBML version %"PRIu64", doctype %s, doc version %"PRIu64")\n",
|
|
|
|
ebml.version, ebml.doctype, ebml.doctype_version);
|
2010-05-22 04:41:32 +03:00
|
|
|
ebml_free(ebml_syntax, &ebml);
|
|
|
|
return AVERROR_PATCHWELCOME;
|
2011-05-21 18:14:14 +03:00
|
|
|
} else if (ebml.doctype_version == 3) {
|
|
|
|
av_log(matroska->ctx, AV_LOG_WARNING,
|
|
|
|
"EBML header using unsupported features\n"
|
|
|
|
"(EBML version %"PRIu64", doctype %s, doc version %"PRIu64")\n",
|
|
|
|
ebml.version, ebml.doctype, ebml.doctype_version);
|
2010-05-22 04:41:32 +03:00
|
|
|
}
|
|
|
|
for (i = 0; i < FF_ARRAY_ELEMS(matroska_doctypes); i++)
|
|
|
|
if (!strcmp(ebml.doctype, matroska_doctypes[i]))
|
|
|
|
break;
|
|
|
|
if (i >= FF_ARRAY_ELEMS(matroska_doctypes)) {
|
2010-05-22 04:41:35 +03:00
|
|
|
av_log(s, AV_LOG_WARNING, "Unknown EBML doctype '%s'\n", ebml.doctype);
|
2012-07-12 14:38:50 +03:00
|
|
|
if (matroska->ctx->error_recognition & AV_EF_EXPLODE) {
|
|
|
|
ebml_free(ebml_syntax, &ebml);
|
|
|
|
return AVERROR_INVALIDDATA;
|
|
|
|
}
|
2007-06-05 01:10:54 +03:00
|
|
|
}
|
2008-08-05 03:40:02 +03:00
|
|
|
ebml_free(ebml_syntax, &ebml);
|
2007-06-05 01:10:54 +03:00
|
|
|
|
|
|
|
/* The next thing is a segment. */
|
2012-02-14 01:06:19 +03:00
|
|
|
pos = avio_tell(matroska->ctx->pb);
|
|
|
|
res = ebml_parse(matroska, matroska_segments, matroska);
|
|
|
|
// try resyncing until we find a EBML_STOP type element.
|
|
|
|
while (res != 1) {
|
|
|
|
res = matroska_resync(matroska, pos);
|
|
|
|
if (res < 0)
|
|
|
|
return res;
|
|
|
|
pos = avio_tell(matroska->ctx->pb);
|
|
|
|
res = ebml_parse(matroska, matroska_segment, matroska);
|
|
|
|
}
|
2008-08-05 03:40:36 +03:00
|
|
|
matroska_execute_seekhead(matroska);
|
2007-06-05 01:10:54 +03:00
|
|
|
|
2010-05-19 00:21:28 +03:00
|
|
|
if (!matroska->time_scale)
|
|
|
|
matroska->time_scale = 1000000;
|
2008-08-05 03:40:55 +03:00
|
|
|
if (matroska->duration)
|
|
|
|
matroska->ctx->duration = matroska->duration * matroska->time_scale
|
|
|
|
* 1000 / AV_TIME_BASE;
|
2011-05-22 13:46:29 +03:00
|
|
|
av_dict_set(&s->metadata, "title", matroska->title, 0);
|
2013-11-24 11:31:48 +03:00
|
|
|
av_dict_set(&s->metadata, "encoder", matroska->muxingapp, 0);
|
2008-08-05 03:40:55 +03:00
|
|
|
|
2012-03-05 21:02:48 +03:00
|
|
|
if (matroska->date_utc.size == 8)
|
|
|
|
matroska_metadata_creation_time(&s->metadata, AV_RB64(matroska->date_utc.data));
|
|
|
|
|
2008-08-05 03:40:52 +03:00
|
|
|
tracks = matroska->tracks.elem;
|
|
|
|
for (i=0; i < matroska->tracks.nb_elem; i++) {
|
|
|
|
MatroskaTrack *track = &tracks[i];
|
2012-08-05 12:11:04 +03:00
|
|
|
enum AVCodecID codec_id = AV_CODEC_ID_NONE;
|
2011-08-18 01:21:21 +03:00
|
|
|
EbmlList *encodings_list = &track->encodings;
|
2008-08-05 03:40:55 +03:00
|
|
|
MatroskaTrackEncoding *encodings = encodings_list->elem;
|
2008-08-05 03:40:52 +03:00
|
|
|
uint8_t *extradata = NULL;
|
|
|
|
int extradata_size = 0;
|
|
|
|
int extradata_offset = 0;
|
2011-06-14 02:58:11 +03:00
|
|
|
uint32_t fourcc = 0;
|
2011-02-20 12:04:12 +02:00
|
|
|
AVIOContext b;
|
2013-03-07 19:11:38 +03:00
|
|
|
char* key_id_base64 = NULL;
|
2014-02-26 02:02:51 +03:00
|
|
|
int bit_depth = -1;
|
2008-08-05 03:40:52 +03:00
|
|
|
|
|
|
|
/* Apply some sanity checks. */
|
2008-08-05 03:40:55 +03:00
|
|
|
if (track->type != MATROSKA_TRACK_TYPE_VIDEO &&
|
|
|
|
track->type != MATROSKA_TRACK_TYPE_AUDIO &&
|
2013-08-09 01:40:03 +03:00
|
|
|
track->type != MATROSKA_TRACK_TYPE_SUBTITLE &&
|
|
|
|
track->type != MATROSKA_TRACK_TYPE_METADATA) {
|
2008-08-05 03:40:55 +03:00
|
|
|
av_log(matroska->ctx, AV_LOG_INFO,
|
|
|
|
"Unknown or unsupported track type %"PRIu64"\n",
|
|
|
|
track->type);
|
|
|
|
continue;
|
|
|
|
}
|
2008-08-05 03:40:52 +03:00
|
|
|
if (track->codec_id == NULL)
|
|
|
|
continue;
|
|
|
|
|
2008-08-05 03:40:55 +03:00
|
|
|
if (track->type == MATROSKA_TRACK_TYPE_VIDEO) {
|
2012-04-18 15:48:20 +03:00
|
|
|
if (!track->default_duration && track->video.frame_rate > 0)
|
2008-08-05 03:40:55 +03:00
|
|
|
track->default_duration = 1000000000/track->video.frame_rate;
|
2013-04-04 00:40:13 +03:00
|
|
|
if (track->video.display_width == -1)
|
2008-08-05 03:40:55 +03:00
|
|
|
track->video.display_width = track->video.pixel_width;
|
2013-04-04 00:40:13 +03:00
|
|
|
if (track->video.display_height == -1)
|
2008-08-05 03:40:55 +03:00
|
|
|
track->video.display_height = track->video.pixel_height;
|
2011-06-14 03:00:06 +03:00
|
|
|
if (track->video.color_space.size == 4)
|
|
|
|
fourcc = AV_RL32(track->video.color_space.data);
|
2008-08-05 03:40:55 +03:00
|
|
|
} else if (track->type == MATROSKA_TRACK_TYPE_AUDIO) {
|
|
|
|
if (!track->audio.out_samplerate)
|
|
|
|
track->audio.out_samplerate = track->audio.samplerate;
|
|
|
|
}
|
|
|
|
if (encodings_list->nb_elem > 1) {
|
|
|
|
av_log(matroska->ctx, AV_LOG_ERROR,
|
2011-09-15 10:34:38 +03:00
|
|
|
"Multiple combined encodings not supported");
|
2008-08-05 03:40:55 +03:00
|
|
|
} else if (encodings_list->nb_elem == 1) {
|
2013-03-07 19:11:38 +03:00
|
|
|
if (encodings[0].type) {
|
|
|
|
if (encodings[0].encryption.key_id.size > 0) {
|
|
|
|
/* Save the encryption key id to be stored later as a
|
|
|
|
metadata tag. */
|
|
|
|
const int b64_size = AV_BASE64_SIZE(encodings[0].encryption.key_id.size);
|
|
|
|
key_id_base64 = av_malloc(b64_size);
|
|
|
|
if (key_id_base64 == NULL)
|
|
|
|
return AVERROR(ENOMEM);
|
|
|
|
|
|
|
|
av_base64_encode(key_id_base64, b64_size,
|
|
|
|
encodings[0].encryption.key_id.data,
|
|
|
|
encodings[0].encryption.key_id.size);
|
|
|
|
} else {
|
|
|
|
encodings[0].scope = 0;
|
|
|
|
av_log(matroska->ctx, AV_LOG_ERROR,
|
|
|
|
"Unsupported encoding type");
|
|
|
|
}
|
|
|
|
} else if (
|
2009-01-14 01:44:16 +02:00
|
|
|
#if CONFIG_ZLIB
|
2008-08-05 03:40:55 +03:00
|
|
|
encodings[0].compression.algo != MATROSKA_TRACK_ENCODING_COMP_ZLIB &&
|
|
|
|
#endif
|
2009-01-14 01:44:16 +02:00
|
|
|
#if CONFIG_BZLIB
|
2008-08-05 03:40:55 +03:00
|
|
|
encodings[0].compression.algo != MATROSKA_TRACK_ENCODING_COMP_BZLIB &&
|
|
|
|
#endif
|
2012-10-18 20:48:27 +03:00
|
|
|
#if CONFIG_LZO
|
|
|
|
encodings[0].compression.algo != MATROSKA_TRACK_ENCODING_COMP_LZO &&
|
|
|
|
#endif
|
2013-03-07 19:11:38 +03:00
|
|
|
encodings[0].compression.algo != MATROSKA_TRACK_ENCODING_COMP_HEADERSTRIP) {
|
2008-08-05 03:40:55 +03:00
|
|
|
encodings[0].scope = 0;
|
|
|
|
av_log(matroska->ctx, AV_LOG_ERROR,
|
|
|
|
"Unsupported encoding type");
|
|
|
|
} else if (track->codec_priv.size && encodings[0].scope&2) {
|
|
|
|
uint8_t *codec_priv = track->codec_priv.data;
|
2012-09-14 19:51:49 +03:00
|
|
|
int ret = matroska_decode_buffer(&track->codec_priv.data,
|
|
|
|
&track->codec_priv.size,
|
|
|
|
track);
|
|
|
|
if (ret < 0) {
|
2008-08-05 03:40:55 +03:00
|
|
|
track->codec_priv.data = NULL;
|
|
|
|
track->codec_priv.size = 0;
|
|
|
|
av_log(matroska->ctx, AV_LOG_ERROR,
|
|
|
|
"Failed to decode codec private data\n");
|
|
|
|
}
|
2012-09-14 19:51:49 +03:00
|
|
|
|
2008-08-05 03:40:55 +03:00
|
|
|
if (codec_priv != track->codec_priv.data)
|
|
|
|
av_free(codec_priv);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-08-05 12:11:04 +03:00
|
|
|
for(j=0; ff_mkv_codec_tags[j].id != AV_CODEC_ID_NONE; j++){
|
2008-08-05 03:40:52 +03:00
|
|
|
if(!strncmp(ff_mkv_codec_tags[j].str, track->codec_id,
|
|
|
|
strlen(ff_mkv_codec_tags[j].str))){
|
|
|
|
codec_id= ff_mkv_codec_tags[j].id;
|
|
|
|
break;
|
2007-06-05 01:10:54 +03:00
|
|
|
}
|
2008-08-05 03:40:52 +03:00
|
|
|
}
|
2007-06-05 01:10:54 +03:00
|
|
|
|
2011-06-18 12:43:24 +03:00
|
|
|
st = track->stream = avformat_new_stream(s, NULL);
|
2013-03-07 19:11:38 +03:00
|
|
|
if (st == NULL) {
|
|
|
|
av_free(key_id_base64);
|
2008-08-05 03:40:52 +03:00
|
|
|
return AVERROR(ENOMEM);
|
2013-03-07 19:11:38 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
if (key_id_base64) {
|
|
|
|
/* export encryption key id as base64 metadata tag */
|
|
|
|
av_dict_set(&st->metadata, "enc_key_id", key_id_base64, 0);
|
|
|
|
av_freep(&key_id_base64);
|
|
|
|
}
|
2008-08-05 03:40:52 +03:00
|
|
|
|
2008-08-05 03:42:49 +03:00
|
|
|
if (!strcmp(track->codec_id, "V_MS/VFW/FOURCC")
|
2008-08-05 03:41:31 +03:00
|
|
|
&& track->codec_priv.size >= 40
|
|
|
|
&& track->codec_priv.data != NULL) {
|
2010-03-03 23:46:43 +02:00
|
|
|
track->ms_compat = 1;
|
2014-02-26 02:02:51 +03:00
|
|
|
bit_depth = AV_RL16(track->codec_priv.data + 14);
|
2011-06-14 02:58:11 +03:00
|
|
|
fourcc = AV_RL32(track->codec_priv.data + 16);
|
|
|
|
codec_id = ff_codec_get_id(ff_codec_bmp_tags, fourcc);
|
2009-08-24 16:43:33 +03:00
|
|
|
extradata_offset = 40;
|
2008-08-05 03:42:49 +03:00
|
|
|
} else if (!strcmp(track->codec_id, "A_MS/ACM")
|
2009-10-02 00:14:05 +03:00
|
|
|
&& track->codec_priv.size >= 14
|
2008-08-05 03:41:31 +03:00
|
|
|
&& track->codec_priv.data != NULL) {
|
2011-04-12 18:44:20 +03:00
|
|
|
int ret;
|
2011-02-20 12:04:13 +02:00
|
|
|
ffio_init_context(&b, track->codec_priv.data, track->codec_priv.size,
|
2013-01-04 15:00:14 +03:00
|
|
|
0, NULL, NULL, NULL, NULL);
|
2011-04-12 18:44:20 +03:00
|
|
|
ret = ff_get_wav_header(&b, st->codec, track->codec_priv.size);
|
|
|
|
if (ret < 0)
|
|
|
|
return ret;
|
2009-01-18 19:13:12 +02:00
|
|
|
codec_id = st->codec->codec_id;
|
2009-10-02 00:14:05 +03:00
|
|
|
extradata_offset = FFMIN(track->codec_priv.size, 18);
|
2014-01-19 20:35:33 +03:00
|
|
|
} else if (!strcmp(track->codec_id, "A_QUICKTIME")
|
|
|
|
&& (track->codec_priv.size >= 86)
|
|
|
|
&& (track->codec_priv.data != NULL)) {
|
|
|
|
fourcc = AV_RL32(track->codec_priv.data + 4);
|
|
|
|
codec_id = ff_codec_get_id(ff_codec_movaudio_tags, fourcc);
|
|
|
|
if (ff_codec_get_id(ff_codec_movaudio_tags, AV_RL32(track->codec_priv.data))) {
|
|
|
|
fourcc = AV_RL32(track->codec_priv.data);
|
|
|
|
codec_id = ff_codec_get_id(ff_codec_movaudio_tags, fourcc);
|
|
|
|
}
|
2008-08-05 03:41:31 +03:00
|
|
|
} else if (!strcmp(track->codec_id, "V_QUICKTIME")
|
2014-01-19 22:13:38 +03:00
|
|
|
&& (track->codec_priv.size >= 21)
|
2008-08-05 03:41:31 +03:00
|
|
|
&& (track->codec_priv.data != NULL)) {
|
2014-01-19 20:35:33 +03:00
|
|
|
fourcc = AV_RL32(track->codec_priv.data + 4);
|
2012-02-16 02:49:16 +03:00
|
|
|
codec_id = ff_codec_get_id(ff_codec_movvideo_tags, fourcc);
|
2014-01-19 20:35:33 +03:00
|
|
|
if (ff_codec_get_id(ff_codec_movvideo_tags, AV_RL32(track->codec_priv.data))) {
|
|
|
|
fourcc = AV_RL32(track->codec_priv.data);
|
|
|
|
codec_id = ff_codec_get_id(ff_codec_movvideo_tags, fourcc);
|
|
|
|
}
|
2014-01-19 22:13:38 +03:00
|
|
|
if (codec_id == AV_CODEC_ID_NONE && AV_RL32(track->codec_priv.data+4) == AV_RL32("SMI "))
|
|
|
|
codec_id = AV_CODEC_ID_SVQ3;
|
2012-08-05 12:11:04 +03:00
|
|
|
} else if (codec_id == AV_CODEC_ID_PCM_S16BE) {
|
2008-08-20 03:49:45 +03:00
|
|
|
switch (track->audio.bitdepth) {
|
2012-08-05 12:11:04 +03:00
|
|
|
case 8: codec_id = AV_CODEC_ID_PCM_U8; break;
|
|
|
|
case 24: codec_id = AV_CODEC_ID_PCM_S24BE; break;
|
|
|
|
case 32: codec_id = AV_CODEC_ID_PCM_S32BE; break;
|
2008-08-20 03:49:45 +03:00
|
|
|
}
|
2012-08-05 12:11:04 +03:00
|
|
|
} else if (codec_id == AV_CODEC_ID_PCM_S16LE) {
|
2008-08-20 03:49:45 +03:00
|
|
|
switch (track->audio.bitdepth) {
|
2012-08-05 12:11:04 +03:00
|
|
|
case 8: codec_id = AV_CODEC_ID_PCM_U8; break;
|
|
|
|
case 24: codec_id = AV_CODEC_ID_PCM_S24LE; break;
|
|
|
|
case 32: codec_id = AV_CODEC_ID_PCM_S32LE; break;
|
2008-08-20 03:49:45 +03:00
|
|
|
}
|
2012-08-05 12:11:04 +03:00
|
|
|
} else if (codec_id==AV_CODEC_ID_PCM_F32LE && track->audio.bitdepth==64) {
|
|
|
|
codec_id = AV_CODEC_ID_PCM_F64LE;
|
|
|
|
} else if (codec_id == AV_CODEC_ID_AAC && !track->codec_priv.size) {
|
2008-08-05 03:40:52 +03:00
|
|
|
int profile = matroska_aac_profile(track->codec_id);
|
|
|
|
int sri = matroska_aac_sri(track->audio.samplerate);
|
2012-01-26 01:34:21 +03:00
|
|
|
extradata = av_mallocz(5 + FF_INPUT_BUFFER_PADDING_SIZE);
|
2008-08-05 03:40:52 +03:00
|
|
|
if (extradata == NULL)
|
|
|
|
return AVERROR(ENOMEM);
|
|
|
|
extradata[0] = (profile << 3) | ((sri&0x0E) >> 1);
|
|
|
|
extradata[1] = ((sri&0x01) << 7) | (track->audio.channels<<3);
|
|
|
|
if (strstr(track->codec_id, "SBR")) {
|
|
|
|
sri = matroska_aac_sri(track->audio.out_samplerate);
|
|
|
|
extradata[2] = 0x56;
|
|
|
|
extradata[3] = 0xE5;
|
|
|
|
extradata[4] = 0x80 | (sri<<3);
|
|
|
|
extradata_size = 5;
|
2008-08-05 03:41:10 +03:00
|
|
|
} else
|
2008-08-05 03:40:52 +03:00
|
|
|
extradata_size = 2;
|
2013-06-07 13:06:15 +03:00
|
|
|
} else if (codec_id == AV_CODEC_ID_ALAC && track->codec_priv.size && track->codec_priv.size < INT_MAX - 12 - FF_INPUT_BUFFER_PADDING_SIZE) {
|
|
|
|
/* Only ALAC's magic cookie is stored in Matroska's track headers.
|
|
|
|
Create the "atom size", "tag", and "tag version" fields the
|
|
|
|
decoder expects manually. */
|
|
|
|
extradata_size = 12 + track->codec_priv.size;
|
|
|
|
extradata = av_mallocz(extradata_size + FF_INPUT_BUFFER_PADDING_SIZE);
|
|
|
|
if (extradata == NULL)
|
|
|
|
return AVERROR(ENOMEM);
|
|
|
|
AV_WB32(extradata, extradata_size);
|
|
|
|
memcpy(&extradata[4], "alac", 4);
|
|
|
|
AV_WB32(&extradata[8], 0);
|
|
|
|
memcpy(&extradata[12], track->codec_priv.data,
|
|
|
|
track->codec_priv.size);
|
2012-08-05 12:11:04 +03:00
|
|
|
} else if (codec_id == AV_CODEC_ID_TTA) {
|
2008-08-05 03:40:52 +03:00
|
|
|
extradata_size = 30;
|
2012-01-26 19:22:34 +03:00
|
|
|
extradata = av_mallocz(extradata_size + FF_INPUT_BUFFER_PADDING_SIZE);
|
2008-08-05 03:40:52 +03:00
|
|
|
if (extradata == NULL)
|
|
|
|
return AVERROR(ENOMEM);
|
2011-02-20 12:04:13 +02:00
|
|
|
ffio_init_context(&b, extradata, extradata_size, 1,
|
2008-08-05 03:40:52 +03:00
|
|
|
NULL, NULL, NULL, NULL);
|
2011-02-21 20:28:17 +02:00
|
|
|
avio_write(&b, "TTA1", 4);
|
|
|
|
avio_wl16(&b, 1);
|
|
|
|
avio_wl16(&b, track->audio.channels);
|
|
|
|
avio_wl16(&b, track->audio.bitdepth);
|
2013-08-18 03:20:54 +03:00
|
|
|
if (track->audio.out_samplerate < 0 || track->audio.out_samplerate > INT_MAX)
|
|
|
|
return AVERROR_INVALIDDATA;
|
2011-02-21 20:28:17 +02:00
|
|
|
avio_wl32(&b, track->audio.out_samplerate);
|
matroskadec: Improve TTA duration calculation
Calculate the duration as accurately as possible to improve decoding of samples
where the last frame is smaller than the rest.
Example:
Take lossless-audio/luckynight-partial.tak from the FATE suit and convert it
to TTA muxed into matroska:
ffmpeg -i $(SAMPLES)/lossless-audio/luckynight-partial.tak -c:a tta lucky.mka
The framemd5 output for lucky.mka without this patch:
0, 0, 0, 46080, 184320, 7c3751ddd571d2903c3cf0ab4b3e3d0a
0, 46080, 46080, 46080, 184320, 6b70c782ba1da3f933fde2daa4f96b73
0, 92160, 92160, 46080, 184320, dcf70d89c54b9a4f0b302d4ec4fb302d
0, 138240, 138240, 46080, 184320, 48713ca38b388d2ea4abf5b86ed1226f
0, 184320, 184320, 46080, 184320, 12188a23648e7ebfb07cd6fe9197b2ea
0, 230400, 230400, 46080, 184320, 49653ab8186a5d4a044ed284671a26e0
0, 276480, 276480, 46080, 184320, 5e82c6a7fe58c7ea612c03a0a2927dd4
0, 322560, 322560, 46080, 184320, 83dc449dbd9eab5f2e8ad2b4403d6a21
0, 368640, 368640, 46080, 184320, bdd6b92c23d30978d4e802d305b0fc49
With this patch:
0, 0, 0, 46080, 184320, 7c3751ddd571d2903c3cf0ab4b3e3d0a
0, 46080, 46080, 46080, 184320, 6b70c782ba1da3f933fde2daa4f96b73
0, 92160, 92160, 46080, 184320, dcf70d89c54b9a4f0b302d4ec4fb302d
0, 138240, 138240, 46080, 184320, 48713ca38b388d2ea4abf5b86ed1226f
0, 184320, 184320, 46080, 184320, 12188a23648e7ebfb07cd6fe9197b2ea
0, 230400, 230400, 46080, 184320, 49653ab8186a5d4a044ed284671a26e0
0, 276480, 276480, 46080, 184320, 5e82c6a7fe58c7ea612c03a0a2927dd4
0, 322560, 322560, 46080, 184320, 83dc449dbd9eab5f2e8ad2b4403d6a21
0, 368640, 368640, 46080, 184320, bdd6b92c23d30978d4e802d305b0fc49
0, 414720, 414720, 4230, 16920, b50b440c5bbcecb8e9fbece643447593
The duration without this patch was calculated as 418950000000, which is bigger
than uint32_t and as such stored as 2338172288.
With this patch the duration is correctly calculated as 418950.
Signed-off-by: James Almer <jamrial@gmail.com>
Approved-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-17 20:48:33 +03:00
|
|
|
avio_wl32(&b, av_rescale((matroska->duration * matroska->time_scale), track->audio.out_samplerate, AV_TIME_BASE * 1000));
|
2012-08-05 12:11:04 +03:00
|
|
|
} 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) {
|
2008-08-05 03:40:52 +03:00
|
|
|
extradata_offset = 26;
|
2012-08-05 12:11:04 +03:00
|
|
|
} else if (codec_id == AV_CODEC_ID_RA_144) {
|
2008-08-05 03:40:52 +03:00
|
|
|
track->audio.out_samplerate = 8000;
|
|
|
|
track->audio.channels = 1;
|
2012-08-07 23:45:46 +03:00
|
|
|
} else if ((codec_id == AV_CODEC_ID_RA_288 || codec_id == AV_CODEC_ID_COOK ||
|
|
|
|
codec_id == AV_CODEC_ID_ATRAC3 || codec_id == AV_CODEC_ID_SIPR)
|
2012-04-14 20:33:24 +03:00
|
|
|
&& track->codec_priv.data) {
|
2010-03-13 01:49:06 +02:00
|
|
|
int flavor;
|
2012-04-14 20:33:24 +03:00
|
|
|
|
2011-02-20 12:04:13 +02:00
|
|
|
ffio_init_context(&b, track->codec_priv.data,track->codec_priv.size,
|
2008-08-05 03:40:52 +03:00
|
|
|
0, NULL, NULL, NULL, NULL);
|
2011-03-15 10:14:38 +02:00
|
|
|
avio_skip(&b, 22);
|
2011-02-21 17:43:01 +02:00
|
|
|
flavor = avio_rb16(&b);
|
|
|
|
track->audio.coded_framesize = avio_rb32(&b);
|
2011-03-15 10:14:38 +02:00
|
|
|
avio_skip(&b, 12);
|
2011-02-21 17:43:01 +02:00
|
|
|
track->audio.sub_packet_h = avio_rb16(&b);
|
|
|
|
track->audio.frame_size = avio_rb16(&b);
|
|
|
|
track->audio.sub_packet_size = avio_rb16(&b);
|
2013-12-25 02:26:32 +03:00
|
|
|
if (flavor < 0 || track->audio.coded_framesize <= 0 ||
|
2013-09-16 15:36:24 +03:00
|
|
|
track->audio.sub_packet_h <= 0 || track->audio.frame_size <= 0 ||
|
|
|
|
track->audio.sub_packet_size <= 0)
|
|
|
|
return AVERROR_INVALIDDATA;
|
2013-09-16 21:03:27 +03:00
|
|
|
track->audio.buf = av_malloc_array(track->audio.sub_packet_h, track->audio.frame_size);
|
|
|
|
if (!track->audio.buf)
|
|
|
|
return AVERROR(ENOMEM);
|
2012-08-05 12:11:04 +03:00
|
|
|
if (codec_id == AV_CODEC_ID_RA_288) {
|
2008-08-05 03:40:52 +03:00
|
|
|
st->codec->block_align = track->audio.coded_framesize;
|
|
|
|
track->codec_priv.size = 0;
|
|
|
|
} else {
|
2012-08-05 12:11:04 +03:00
|
|
|
if (codec_id == AV_CODEC_ID_SIPR && flavor < 4) {
|
2013-08-04 22:18:49 +03:00
|
|
|
static const int sipr_bit_rate[4] = { 6504, 8496, 5000, 16000 };
|
2010-03-13 01:49:06 +02:00
|
|
|
track->audio.sub_packet_size = ff_sipr_subpk_size[flavor];
|
|
|
|
st->codec->bit_rate = sipr_bit_rate[flavor];
|
|
|
|
}
|
2008-08-05 03:40:52 +03:00
|
|
|
st->codec->block_align = track->audio.sub_packet_size;
|
|
|
|
extradata_offset = 78;
|
2007-06-05 01:10:54 +03:00
|
|
|
}
|
2008-08-05 03:40:52 +03:00
|
|
|
}
|
2009-08-24 16:40:30 +03:00
|
|
|
track->codec_priv.size -= extradata_offset;
|
2007-06-05 01:10:54 +03:00
|
|
|
|
2012-08-05 12:11:04 +03:00
|
|
|
if (codec_id == AV_CODEC_ID_NONE)
|
2008-08-05 03:40:52 +03:00
|
|
|
av_log(matroska->ctx, AV_LOG_INFO,
|
2012-08-05 12:11:04 +03:00
|
|
|
"Unknown/unsupported AVCodecID %s.\n", track->codec_id);
|
2007-06-05 01:19:17 +03:00
|
|
|
|
2008-09-09 14:23:48 +03:00
|
|
|
if (track->time_scale < 0.01)
|
|
|
|
track->time_scale = 1.0;
|
2011-11-29 21:28:15 +03:00
|
|
|
avpriv_set_pts_info(st, 64, matroska->time_scale*track->time_scale, 1000*1000*1000); /* 64 bit pts in ns */
|
2007-06-05 01:19:17 +03:00
|
|
|
|
2008-08-05 03:40:52 +03:00
|
|
|
st->codec->codec_id = codec_id;
|
2013-12-23 12:41:35 +03:00
|
|
|
|
2008-08-05 03:40:52 +03:00
|
|
|
if (strcmp(track->language, "und"))
|
2011-05-22 13:46:29 +03:00
|
|
|
av_dict_set(&st->metadata, "language", track->language, 0);
|
|
|
|
av_dict_set(&st->metadata, "title", track->name, 0);
|
2007-06-05 01:10:54 +03:00
|
|
|
|
2008-08-05 03:40:52 +03:00
|
|
|
if (track->flag_default)
|
|
|
|
st->disposition |= AV_DISPOSITION_DEFAULT;
|
2010-07-02 19:38:44 +03:00
|
|
|
if (track->flag_forced)
|
|
|
|
st->disposition |= AV_DISPOSITION_FORCED;
|
2007-06-05 01:10:54 +03:00
|
|
|
|
2009-10-02 00:14:46 +03:00
|
|
|
if (!st->codec->extradata) {
|
2009-10-02 00:15:36 +03:00
|
|
|
if(extradata){
|
|
|
|
st->codec->extradata = extradata;
|
|
|
|
st->codec->extradata_size = extradata_size;
|
|
|
|
} else if(track->codec_priv.data && track->codec_priv.size > 0){
|
2013-10-13 13:30:59 +03:00
|
|
|
if (ff_alloc_extradata(st->codec, track->codec_priv.size))
|
2009-10-02 00:15:36 +03:00
|
|
|
return AVERROR(ENOMEM);
|
|
|
|
memcpy(st->codec->extradata,
|
|
|
|
track->codec_priv.data + extradata_offset,
|
|
|
|
track->codec_priv.size);
|
|
|
|
}
|
2009-10-02 00:14:46 +03:00
|
|
|
}
|
2008-08-05 03:40:52 +03:00
|
|
|
|
|
|
|
if (track->type == MATROSKA_TRACK_TYPE_VIDEO) {
|
2011-05-24 02:09:24 +03:00
|
|
|
MatroskaTrackPlane *planes = track->operation.combine_planes.elem;
|
|
|
|
|
2010-03-31 02:30:55 +03:00
|
|
|
st->codec->codec_type = AVMEDIA_TYPE_VIDEO;
|
2011-06-14 02:58:11 +03:00
|
|
|
st->codec->codec_tag = fourcc;
|
2014-02-26 02:02:51 +03:00
|
|
|
if (bit_depth >= 0)
|
|
|
|
st->codec->bits_per_coded_sample = bit_depth;
|
2008-08-05 03:40:52 +03:00
|
|
|
st->codec->width = track->video.pixel_width;
|
|
|
|
st->codec->height = track->video.pixel_height;
|
2008-08-24 02:43:20 +03:00
|
|
|
av_reduce(&st->sample_aspect_ratio.num,
|
|
|
|
&st->sample_aspect_ratio.den,
|
2008-08-05 03:40:52 +03:00
|
|
|
st->codec->height * track->video.display_width,
|
|
|
|
st->codec-> width * track->video.display_height,
|
|
|
|
255);
|
2013-10-12 12:55:46 +03:00
|
|
|
if (st->codec->codec_id != AV_CODEC_ID_HEVC)
|
|
|
|
st->need_parsing = AVSTREAM_PARSE_HEADERS;
|
2013-11-01 19:57:57 +03:00
|
|
|
|
2012-04-18 02:32:07 +03:00
|
|
|
if (track->default_duration) {
|
2012-06-26 14:10:01 +03:00
|
|
|
av_reduce(&st->avg_frame_rate.num, &st->avg_frame_rate.den,
|
2012-04-18 02:32:07 +03:00
|
|
|
1000000000, track->default_duration, 30000);
|
2012-06-26 14:10:01 +03:00
|
|
|
#if FF_API_R_FRAME_RATE
|
2013-10-06 01:07:28 +03:00
|
|
|
if (st->avg_frame_rate.num < st->avg_frame_rate.den * 1000L)
|
|
|
|
st->r_frame_rate = st->avg_frame_rate;
|
2012-06-26 14:10:01 +03:00
|
|
|
#endif
|
2012-04-18 02:32:07 +03:00
|
|
|
}
|
2011-05-21 18:14:14 +03:00
|
|
|
|
2011-05-24 02:09:24 +03:00
|
|
|
/* export stereo mode flag as metadata tag */
|
|
|
|
if (track->video.stereo_mode && track->video.stereo_mode < MATROSKA_VIDEO_STEREO_MODE_COUNT)
|
2012-09-16 03:58:40 +03:00
|
|
|
av_dict_set(&st->metadata, "stereo_mode", ff_matroska_video_stereo_mode[track->video.stereo_mode], 0);
|
2011-05-24 02:09:24 +03:00
|
|
|
|
2013-02-05 02:17:52 +03:00
|
|
|
/* export alpha mode flag as metadata tag */
|
|
|
|
if (track->video.alpha_mode)
|
|
|
|
av_dict_set(&st->metadata, "alpha_mode", "1", 0);
|
|
|
|
|
2011-05-24 02:09:24 +03:00
|
|
|
/* if we have virtual track, mark the real tracks */
|
|
|
|
for (j=0; j < track->operation.combine_planes.nb_elem; j++) {
|
|
|
|
char buf[32];
|
2011-05-25 00:26:24 +03:00
|
|
|
if (planes[j].type >= MATROSKA_VIDEO_STEREO_PLANE_COUNT)
|
2011-05-24 02:09:24 +03:00
|
|
|
continue;
|
|
|
|
snprintf(buf, sizeof(buf), "%s_%d",
|
2012-09-16 03:58:40 +03:00
|
|
|
ff_matroska_video_stereo_plane[planes[j].type], i);
|
2011-05-24 02:09:24 +03:00
|
|
|
for (k=0; k < matroska->tracks.nb_elem; k++)
|
|
|
|
if (planes[j].uid == tracks[k].uid) {
|
2011-06-13 20:02:50 +03:00
|
|
|
av_dict_set(&s->streams[k]->metadata,
|
|
|
|
"stereo_mode", buf, 0);
|
2011-05-21 18:14:14 +03:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
2008-08-05 03:40:52 +03:00
|
|
|
} else if (track->type == MATROSKA_TRACK_TYPE_AUDIO) {
|
2010-03-31 02:30:55 +03:00
|
|
|
st->codec->codec_type = AVMEDIA_TYPE_AUDIO;
|
2008-08-05 03:40:52 +03:00
|
|
|
st->codec->sample_rate = track->audio.out_samplerate;
|
|
|
|
st->codec->channels = track->audio.channels;
|
2014-01-16 01:37:47 +03:00
|
|
|
if (!st->codec->bits_per_coded_sample)
|
2013-01-24 15:13:46 +03:00
|
|
|
st->codec->bits_per_coded_sample = track->audio.bitdepth;
|
2012-08-05 12:11:04 +03:00
|
|
|
if (st->codec->codec_id != AV_CODEC_ID_AAC)
|
2010-04-21 00:19:27 +03:00
|
|
|
st->need_parsing = AVSTREAM_PARSE_HEADERS;
|
2013-10-14 20:42:08 +03:00
|
|
|
if (track->codec_delay > 0) {
|
|
|
|
st->codec->delay = av_rescale_q(track->codec_delay,
|
|
|
|
(AVRational){1, 1000000000},
|
|
|
|
(AVRational){1, st->codec->sample_rate});
|
|
|
|
}
|
|
|
|
if (track->seek_preroll > 0) {
|
|
|
|
av_codec_set_seek_preroll(st->codec,
|
|
|
|
av_rescale_q(track->seek_preroll,
|
|
|
|
(AVRational){1, 1000000000},
|
|
|
|
(AVRational){1, st->codec->sample_rate}));
|
|
|
|
}
|
2013-08-09 01:40:03 +03:00
|
|
|
} else if (codec_id == AV_CODEC_ID_WEBVTT) {
|
|
|
|
st->codec->codec_type = AVMEDIA_TYPE_SUBTITLE;
|
|
|
|
|
|
|
|
if (!strcmp(track->codec_id, "D_WEBVTT/CAPTIONS")) {
|
|
|
|
st->disposition |= AV_DISPOSITION_CAPTIONS;
|
|
|
|
} else if (!strcmp(track->codec_id, "D_WEBVTT/DESCRIPTIONS")) {
|
|
|
|
st->disposition |= AV_DISPOSITION_DESCRIPTIONS;
|
|
|
|
} else if (!strcmp(track->codec_id, "D_WEBVTT/METADATA")) {
|
|
|
|
st->disposition |= AV_DISPOSITION_METADATA;
|
|
|
|
}
|
2008-08-05 03:40:52 +03:00
|
|
|
} else if (track->type == MATROSKA_TRACK_TYPE_SUBTITLE) {
|
2010-03-31 02:30:55 +03:00
|
|
|
st->codec->codec_type = AVMEDIA_TYPE_SUBTITLE;
|
subtitles: introduce ASS codec id and use it.
Currently, we have a AV_CODEC_ID_SSA, which matches the way the ASS/SSA
markup is muxed in a standalone .ass/.ssa file. This means the AVPacket
data starts with a "Dialogue:" string, followed by a timing information
(start and end of the event as string) and a trailing CRLF after each
line. One packet can contain several lines. We'll refer to this layout
as "SSA" or "SSA lines".
In matroska, this markup is not stored as such: it has no "Dialogue:"
prefix, it contains a ReadOrder field, the timing information is not in
the payload, and it doesn't contain the trailing CRLF. See [1] for more
info. We'll refer to this layout as "ASS".
Since we have only one common codec for both formats, the matroska
demuxer is constructing an AVPacket following the "SSA lines" format.
This causes several problems, so it was decided to change this into
clean ASS packets.
Some insight about what is changed or unchanged in this commit:
CODECS
------
- the decoding process still writes "SSA lines" markup inside the ass
fields of the subtitles rectangles (sub->rects[n]->ass), which is
still the current common way of representing decoded subtitles
markup. It is meant to change later.
- new ASS codec id: AV_CODEC_ID_ASS (which is different from the
legacy AV_CODEC_ID_SSA)
- lavc/assdec: the "ass" decoder is renamed into "ssa" (instead of
"ass") for consistency with the codec id and allows to add a real
ass decoder. This ass decoder receives clean ASS lines (so it starts
with a ReadOrder, is followed by the Layer, etc). We make sure this
is decoded properly in a new ass-line rectangle of the decoded
subtitles (the ssa decoder OTOH is doing a simple straightforward
copy). Using the packet timing instead of data string makes sure the
ass-line now contains the appropriate timing.
- lavc/assenc: just like the ass decoder, the "ssa" encoder is renamed
into "ssa" (instead of "ass") for consistency with the codec id, and
allows to add a real "ass" encoder.
One important thing about this encoder is that it only supports one
ass rectangle: we could have put several dialogue events in the
AVPacket (separated by a \0 for instance) but this would have cause
trouble for the muxer which needs not only the start time, but also
the duration: typically, you have merged events with the same start
time (stored in the AVPacket->pts) but a different duration. At the
moment, only the matroska do the merge with the SSA-line codec.
We will need to make sure all the decoders in the future can't add
more than one rectangle (and only one Dialogue line in it
obviously).
FORMATS
-------
- lavf/assenc: the .ass/.ssa muxer can take both SSA and ASS packets.
In the case of ASS packets as input, it adds the timing based on the
AVPacket pts and duration, and mux it with "Dialogue:", trailing
CRLF, etc.
- lavf/assdec: unchanged; it currently still only outputs SSA-lines
packets.
- lavf/mkv: the demuxer can now output ASS packets without the need of
any "SSA-lines" reconstruction hack. It will become the default at
next libavformat bump, and the SSA support will be dropped from the
demuxer. The muxer can take ASS packets since it's muxed normally,
and still supports the old SSA packets. All the SSA support and
hacks in Matroska code will be dropped at next lavf bump.
[1]: http://www.matroska.org/technical/specs/subtitles/ssa.html
2013-01-03 05:06:43 +03:00
|
|
|
#if FF_API_ASS_SSA
|
|
|
|
if (st->codec->codec_id == AV_CODEC_ID_SSA ||
|
|
|
|
st->codec->codec_id == AV_CODEC_ID_ASS)
|
|
|
|
#else
|
|
|
|
if (st->codec->codec_id == AV_CODEC_ID_ASS)
|
|
|
|
#endif
|
2012-04-19 21:12:24 +03:00
|
|
|
matroska->contains_ssa = 1;
|
2008-08-05 03:40:52 +03:00
|
|
|
}
|
2007-06-05 01:10:54 +03:00
|
|
|
}
|
|
|
|
|
2008-08-05 03:40:55 +03:00
|
|
|
attachements = attachements_list->elem;
|
|
|
|
for (j=0; j<attachements_list->nb_elem; j++) {
|
|
|
|
if (!(attachements[j].filename && attachements[j].mime &&
|
|
|
|
attachements[j].bin.data && attachements[j].bin.size > 0)) {
|
|
|
|
av_log(matroska->ctx, AV_LOG_ERROR, "incomplete attachment\n");
|
|
|
|
} else {
|
2011-06-18 12:43:24 +03:00
|
|
|
AVStream *st = avformat_new_stream(s, NULL);
|
2008-08-05 03:40:55 +03:00
|
|
|
if (st == NULL)
|
|
|
|
break;
|
2011-05-22 13:46:29 +03:00
|
|
|
av_dict_set(&st->metadata, "filename",attachements[j].filename, 0);
|
2011-09-27 11:36:53 +03:00
|
|
|
av_dict_set(&st->metadata, "mimetype", attachements[j].mime, 0);
|
2012-08-05 12:11:04 +03:00
|
|
|
st->codec->codec_id = AV_CODEC_ID_NONE;
|
2010-03-31 02:30:55 +03:00
|
|
|
st->codec->codec_type = AVMEDIA_TYPE_ATTACHMENT;
|
2013-10-13 13:30:59 +03:00
|
|
|
if (ff_alloc_extradata(st->codec, attachements[j].bin.size))
|
2008-08-05 03:40:55 +03:00
|
|
|
break;
|
|
|
|
memcpy(st->codec->extradata, attachements[j].bin.data, attachements[j].bin.size);
|
|
|
|
|
2012-08-05 12:11:04 +03:00
|
|
|
for (i=0; ff_mkv_mime_tags[i].id != AV_CODEC_ID_NONE; i++) {
|
2008-08-05 03:40:55 +03:00
|
|
|
if (!strncmp(ff_mkv_mime_tags[i].str, attachements[j].mime,
|
|
|
|
strlen(ff_mkv_mime_tags[i].str))) {
|
|
|
|
st->codec->codec_id = ff_mkv_mime_tags[i].id;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
2009-02-15 17:53:55 +02:00
|
|
|
attachements[j].stream = st;
|
2008-08-05 03:40:55 +03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
chapters = chapters_list->elem;
|
|
|
|
for (i=0; i<chapters_list->nb_elem; i++)
|
2009-01-15 02:42:57 +02:00
|
|
|
if (chapters[i].start != AV_NOPTS_VALUE && chapters[i].uid
|
|
|
|
&& (max_start==0 || chapters[i].start > max_start)) {
|
2009-02-15 17:25:14 +02:00
|
|
|
chapters[i].chapter =
|
2011-10-17 09:58:50 +03:00
|
|
|
avpriv_new_chapter(s, chapters[i].uid, (AVRational){1, 1000000000},
|
2008-08-05 03:40:55 +03:00
|
|
|
chapters[i].start, chapters[i].end,
|
|
|
|
chapters[i].title);
|
2011-05-22 13:46:29 +03:00
|
|
|
av_dict_set(&chapters[i].chapter->metadata,
|
2010-04-25 17:27:42 +03:00
|
|
|
"title", chapters[i].title, 0);
|
2009-01-15 02:42:57 +02:00
|
|
|
max_start = chapters[i].start;
|
|
|
|
}
|
2008-08-05 03:40:55 +03:00
|
|
|
|
2011-09-22 17:51:00 +03:00
|
|
|
matroska_add_index_entries(matroska);
|
|
|
|
|
2009-02-15 17:53:55 +02:00
|
|
|
matroska_convert_tags(s);
|
|
|
|
|
2008-08-05 03:40:58 +03:00
|
|
|
return 0;
|
2007-06-05 01:10:54 +03:00
|
|
|
}
|
|
|
|
|
2008-08-05 03:42:39 +03:00
|
|
|
/*
|
|
|
|
* Put one packet in an application-supplied AVPacket struct.
|
|
|
|
* Returns 0 on success or -1 on failure.
|
|
|
|
*/
|
|
|
|
static int matroska_deliver_packet(MatroskaDemuxContext *matroska,
|
|
|
|
AVPacket *pkt)
|
|
|
|
{
|
|
|
|
if (matroska->num_packets > 0) {
|
|
|
|
memcpy(pkt, matroska->packets[0], sizeof(AVPacket));
|
|
|
|
av_free(matroska->packets[0]);
|
|
|
|
if (matroska->num_packets > 1) {
|
2011-07-28 15:59:54 +03:00
|
|
|
void *newpackets;
|
2008-08-05 03:42:39 +03:00
|
|
|
memmove(&matroska->packets[0], &matroska->packets[1],
|
|
|
|
(matroska->num_packets - 1) * sizeof(AVPacket *));
|
2011-07-28 15:59:54 +03:00
|
|
|
newpackets = av_realloc(matroska->packets,
|
|
|
|
(matroska->num_packets - 1) * sizeof(AVPacket *));
|
|
|
|
if (newpackets)
|
|
|
|
matroska->packets = newpackets;
|
2008-08-05 03:42:39 +03:00
|
|
|
} else {
|
|
|
|
av_freep(&matroska->packets);
|
2012-04-19 21:12:24 +03:00
|
|
|
matroska->prev_pkt = NULL;
|
2008-08-05 03:42:39 +03:00
|
|
|
}
|
|
|
|
matroska->num_packets--;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Free all packets in our internal queue.
|
|
|
|
*/
|
|
|
|
static void matroska_clear_queue(MatroskaDemuxContext *matroska)
|
|
|
|
{
|
2013-01-10 22:05:29 +03:00
|
|
|
matroska->prev_pkt = NULL;
|
2008-08-05 03:42:39 +03:00
|
|
|
if (matroska->packets) {
|
|
|
|
int n;
|
|
|
|
for (n = 0; n < matroska->num_packets; n++) {
|
|
|
|
av_free_packet(matroska->packets[n]);
|
|
|
|
av_free(matroska->packets[n]);
|
|
|
|
}
|
2008-08-06 03:21:10 +03:00
|
|
|
av_freep(&matroska->packets);
|
2008-08-05 03:42:39 +03:00
|
|
|
matroska->num_packets = 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-09-17 02:58:32 +03:00
|
|
|
static int matroska_parse_laces(MatroskaDemuxContext *matroska, uint8_t **buf,
|
2013-03-27 00:12:30 +03:00
|
|
|
int* buf_size, int type,
|
2012-09-17 02:58:32 +03:00
|
|
|
uint32_t **lace_buf, int *laces)
|
|
|
|
{
|
2013-03-27 00:12:30 +03:00
|
|
|
int res = 0, n, size = *buf_size;
|
2012-09-17 02:58:32 +03:00
|
|
|
uint8_t *data = *buf;
|
|
|
|
uint32_t *lace_size;
|
|
|
|
|
|
|
|
if (!type) {
|
|
|
|
*laces = 1;
|
|
|
|
*lace_buf = av_mallocz(sizeof(int));
|
|
|
|
if (!*lace_buf)
|
|
|
|
return AVERROR(ENOMEM);
|
|
|
|
|
|
|
|
*lace_buf[0] = size;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2012-09-20 21:37:26 +03:00
|
|
|
av_assert0(size > 0);
|
2012-09-17 02:58:32 +03:00
|
|
|
*laces = *data + 1;
|
|
|
|
data += 1;
|
|
|
|
size -= 1;
|
|
|
|
lace_size = av_mallocz(*laces * sizeof(int));
|
|
|
|
if (!lace_size)
|
|
|
|
return AVERROR(ENOMEM);
|
|
|
|
|
|
|
|
switch (type) {
|
|
|
|
case 0x1: /* Xiph lacing */ {
|
|
|
|
uint8_t temp;
|
|
|
|
uint32_t total = 0;
|
|
|
|
for (n = 0; res == 0 && n < *laces - 1; n++) {
|
|
|
|
while (1) {
|
2013-04-04 16:17:57 +03:00
|
|
|
if (size <= total) {
|
2013-04-04 16:13:53 +03:00
|
|
|
res = AVERROR_INVALIDDATA;
|
2012-09-17 02:58:32 +03:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
temp = *data;
|
2013-04-04 16:17:57 +03:00
|
|
|
total += temp;
|
2012-09-17 02:58:32 +03:00
|
|
|
lace_size[n] += temp;
|
|
|
|
data += 1;
|
|
|
|
size -= 1;
|
|
|
|
if (temp != 0xff)
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (size <= total) {
|
|
|
|
res = AVERROR_INVALIDDATA;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
lace_size[n] = size - total;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
case 0x2: /* fixed-size lacing */
|
2012-09-20 21:04:56 +03:00
|
|
|
if (size % (*laces)) {
|
2012-09-17 02:58:32 +03:00
|
|
|
res = AVERROR_INVALIDDATA;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
for (n = 0; n < *laces; n++)
|
|
|
|
lace_size[n] = size / *laces;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case 0x3: /* EBML lacing */ {
|
|
|
|
uint64_t num;
|
2013-03-28 13:52:52 +03:00
|
|
|
uint64_t total;
|
2012-09-17 02:58:32 +03:00
|
|
|
n = matroska_ebmlnum_uint(matroska, data, size, &num);
|
2013-04-04 16:39:23 +03:00
|
|
|
if (n < 0 || num > INT_MAX) {
|
2012-09-17 02:58:32 +03:00
|
|
|
av_log(matroska->ctx, AV_LOG_INFO,
|
|
|
|
"EBML block data error\n");
|
2013-04-04 16:39:23 +03:00
|
|
|
res = n<0 ? n : AVERROR_INVALIDDATA;
|
2012-09-17 02:58:32 +03:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
data += n;
|
|
|
|
size -= n;
|
|
|
|
total = lace_size[0] = num;
|
|
|
|
for (n = 1; res == 0 && n < *laces - 1; n++) {
|
|
|
|
int64_t snum;
|
|
|
|
int r;
|
|
|
|
r = matroska_ebmlnum_sint(matroska, data, size, &snum);
|
2013-04-04 16:39:23 +03:00
|
|
|
if (r < 0 || lace_size[n - 1] + snum > (uint64_t)INT_MAX) {
|
2012-09-17 02:58:32 +03:00
|
|
|
av_log(matroska->ctx, AV_LOG_INFO,
|
|
|
|
"EBML block data error\n");
|
2013-04-04 16:39:23 +03:00
|
|
|
res = r<0 ? r : AVERROR_INVALIDDATA;
|
2012-09-17 02:58:32 +03:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
data += r;
|
|
|
|
size -= r;
|
|
|
|
lace_size[n] = lace_size[n - 1] + snum;
|
|
|
|
total += lace_size[n];
|
|
|
|
}
|
|
|
|
if (size <= total) {
|
|
|
|
res = AVERROR_INVALIDDATA;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
lace_size[*laces - 1] = size - total;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
*buf = data;
|
|
|
|
*lace_buf = lace_size;
|
2013-03-27 00:12:30 +03:00
|
|
|
*buf_size = size;
|
2012-09-17 02:58:32 +03:00
|
|
|
|
|
|
|
return res;
|
|
|
|
}
|
|
|
|
|
2012-09-17 02:28:13 +03:00
|
|
|
static int matroska_parse_rm_audio(MatroskaDemuxContext *matroska,
|
|
|
|
MatroskaTrack *track,
|
|
|
|
AVStream *st,
|
|
|
|
uint8_t *data, int size,
|
2012-09-21 00:43:20 +03:00
|
|
|
uint64_t timecode,
|
2012-09-17 02:28:13 +03:00
|
|
|
int64_t pos)
|
|
|
|
{
|
|
|
|
int a = st->codec->block_align;
|
|
|
|
int sps = track->audio.sub_packet_size;
|
|
|
|
int cfs = track->audio.coded_framesize;
|
|
|
|
int h = track->audio.sub_packet_h;
|
|
|
|
int y = track->audio.sub_packet_cnt;
|
|
|
|
int w = track->audio.frame_size;
|
|
|
|
int x;
|
|
|
|
|
|
|
|
if (!track->audio.pkt_cnt) {
|
|
|
|
if (track->audio.sub_packet_cnt == 0)
|
|
|
|
track->audio.buf_timecode = timecode;
|
|
|
|
if (st->codec->codec_id == AV_CODEC_ID_RA_288) {
|
|
|
|
if (size < cfs * h / 2) {
|
|
|
|
av_log(matroska->ctx, AV_LOG_ERROR,
|
|
|
|
"Corrupt int4 RM-style audio packet size\n");
|
|
|
|
return AVERROR_INVALIDDATA;
|
|
|
|
}
|
|
|
|
for (x=0; x<h/2; x++)
|
|
|
|
memcpy(track->audio.buf+x*2*w+y*cfs,
|
|
|
|
data+x*cfs, cfs);
|
|
|
|
} else if (st->codec->codec_id == AV_CODEC_ID_SIPR) {
|
|
|
|
if (size < w) {
|
|
|
|
av_log(matroska->ctx, AV_LOG_ERROR,
|
|
|
|
"Corrupt sipr RM-style audio packet size\n");
|
|
|
|
return AVERROR_INVALIDDATA;
|
|
|
|
}
|
|
|
|
memcpy(track->audio.buf + y*w, data, w);
|
|
|
|
} else {
|
2014-01-11 01:10:47 +03:00
|
|
|
if (size < sps * w / sps || h<=0 || w%sps) {
|
2012-09-17 02:28:13 +03:00
|
|
|
av_log(matroska->ctx, AV_LOG_ERROR,
|
|
|
|
"Corrupt generic RM-style audio packet size\n");
|
|
|
|
return AVERROR_INVALIDDATA;
|
|
|
|
}
|
|
|
|
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);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (++track->audio.sub_packet_cnt >= h) {
|
|
|
|
if (st->codec->codec_id == AV_CODEC_ID_SIPR)
|
|
|
|
ff_rm_reorder_sipr_data(track->audio.buf, h, w);
|
|
|
|
track->audio.sub_packet_cnt = 0;
|
|
|
|
track->audio.pkt_cnt = h*w / a;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
while (track->audio.pkt_cnt) {
|
2012-10-20 17:55:45 +03:00
|
|
|
AVPacket *pkt = NULL;
|
|
|
|
if (!(pkt = av_mallocz(sizeof(AVPacket))) || av_new_packet(pkt, a) < 0){
|
|
|
|
av_free(pkt);
|
|
|
|
return AVERROR(ENOMEM);
|
|
|
|
}
|
2012-09-17 02:28:13 +03:00
|
|
|
memcpy(pkt->data, track->audio.buf
|
|
|
|
+ a * (h*w / a - track->audio.pkt_cnt--), a);
|
|
|
|
pkt->pts = track->audio.buf_timecode;
|
|
|
|
track->audio.buf_timecode = AV_NOPTS_VALUE;
|
|
|
|
pkt->pos = pos;
|
|
|
|
pkt->stream_index = st->index;
|
|
|
|
dynarray_add(&matroska->packets,&matroska->num_packets,pkt);
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
2013-05-27 10:44:27 +03:00
|
|
|
|
|
|
|
/* reconstruct full wavpack blocks from mangled matroska ones */
|
|
|
|
static int matroska_parse_wavpack(MatroskaTrack *track, uint8_t *src,
|
|
|
|
uint8_t **pdst, int *size)
|
|
|
|
{
|
|
|
|
uint8_t *dst = NULL;
|
|
|
|
int dstlen = 0;
|
|
|
|
int srclen = *size;
|
|
|
|
uint32_t samples;
|
|
|
|
uint16_t ver;
|
|
|
|
int ret, offset = 0;
|
|
|
|
|
|
|
|
if (srclen < 12 || track->stream->codec->extradata_size < 2)
|
|
|
|
return AVERROR_INVALIDDATA;
|
|
|
|
|
|
|
|
ver = AV_RL16(track->stream->codec->extradata);
|
|
|
|
|
|
|
|
samples = AV_RL32(src);
|
|
|
|
src += 4;
|
|
|
|
srclen -= 4;
|
|
|
|
|
|
|
|
while (srclen >= 8) {
|
|
|
|
int multiblock;
|
|
|
|
uint32_t blocksize;
|
|
|
|
uint8_t *tmp;
|
|
|
|
|
|
|
|
uint32_t flags = AV_RL32(src);
|
|
|
|
uint32_t crc = AV_RL32(src + 4);
|
|
|
|
src += 8;
|
|
|
|
srclen -= 8;
|
|
|
|
|
|
|
|
multiblock = (flags & 0x1800) != 0x1800;
|
|
|
|
if (multiblock) {
|
|
|
|
if (srclen < 4) {
|
|
|
|
ret = AVERROR_INVALIDDATA;
|
|
|
|
goto fail;
|
|
|
|
}
|
|
|
|
blocksize = AV_RL32(src);
|
|
|
|
src += 4;
|
|
|
|
srclen -= 4;
|
|
|
|
} else
|
|
|
|
blocksize = srclen;
|
|
|
|
|
|
|
|
if (blocksize > srclen) {
|
|
|
|
ret = AVERROR_INVALIDDATA;
|
|
|
|
goto fail;
|
|
|
|
}
|
|
|
|
|
|
|
|
tmp = av_realloc(dst, dstlen + blocksize + 32);
|
|
|
|
if (!tmp) {
|
|
|
|
ret = AVERROR(ENOMEM);
|
|
|
|
goto fail;
|
|
|
|
}
|
|
|
|
dst = tmp;
|
|
|
|
dstlen += blocksize + 32;
|
|
|
|
|
|
|
|
AV_WL32(dst + offset, MKTAG('w', 'v', 'p', 'k')); // tag
|
|
|
|
AV_WL32(dst + offset + 4, blocksize + 24); // blocksize - 8
|
|
|
|
AV_WL16(dst + offset + 8, ver); // version
|
|
|
|
AV_WL16(dst + offset + 10, 0); // track/index_no
|
|
|
|
AV_WL32(dst + offset + 12, 0); // total samples
|
|
|
|
AV_WL32(dst + offset + 16, 0); // block index
|
|
|
|
AV_WL32(dst + offset + 20, samples); // number of samples
|
|
|
|
AV_WL32(dst + offset + 24, flags); // flags
|
|
|
|
AV_WL32(dst + offset + 28, crc); // crc
|
|
|
|
memcpy (dst + offset + 32, src, blocksize); // block data
|
|
|
|
|
|
|
|
src += blocksize;
|
|
|
|
srclen -= blocksize;
|
|
|
|
offset += blocksize + 32;
|
|
|
|
}
|
|
|
|
|
|
|
|
*pdst = dst;
|
|
|
|
*size = dstlen;
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
fail:
|
|
|
|
av_freep(&dst);
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2013-08-09 01:40:03 +03:00
|
|
|
static int matroska_parse_webvtt(MatroskaDemuxContext *matroska,
|
|
|
|
MatroskaTrack *track,
|
|
|
|
AVStream *st,
|
|
|
|
uint8_t *data, int data_len,
|
|
|
|
uint64_t timecode,
|
|
|
|
uint64_t duration,
|
|
|
|
int64_t pos)
|
|
|
|
{
|
|
|
|
AVPacket *pkt;
|
|
|
|
uint8_t *id, *settings, *text, *buf;
|
|
|
|
int id_len, settings_len, text_len;
|
|
|
|
uint8_t *p, *q;
|
|
|
|
int err;
|
|
|
|
|
|
|
|
if (data_len <= 0)
|
|
|
|
return AVERROR_INVALIDDATA;
|
|
|
|
|
|
|
|
p = data;
|
|
|
|
q = data + data_len;
|
|
|
|
|
|
|
|
id = p;
|
|
|
|
id_len = -1;
|
|
|
|
while (p < q) {
|
|
|
|
if (*p == '\r' || *p == '\n') {
|
|
|
|
id_len = p - id;
|
|
|
|
if (*p == '\r')
|
|
|
|
p++;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
p++;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (p >= q || *p != '\n')
|
|
|
|
return AVERROR_INVALIDDATA;
|
|
|
|
p++;
|
|
|
|
|
|
|
|
settings = p;
|
|
|
|
settings_len = -1;
|
|
|
|
while (p < q) {
|
|
|
|
if (*p == '\r' || *p == '\n') {
|
|
|
|
settings_len = p - settings;
|
|
|
|
if (*p == '\r')
|
|
|
|
p++;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
p++;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (p >= q || *p != '\n')
|
|
|
|
return AVERROR_INVALIDDATA;
|
|
|
|
p++;
|
|
|
|
|
|
|
|
text = p;
|
|
|
|
text_len = q - p;
|
|
|
|
while (text_len > 0) {
|
|
|
|
const int len = text_len - 1;
|
|
|
|
const uint8_t c = p[len];
|
|
|
|
if (c != '\r' && c != '\n')
|
|
|
|
break;
|
|
|
|
text_len = len;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (text_len <= 0)
|
|
|
|
return AVERROR_INVALIDDATA;
|
|
|
|
|
|
|
|
pkt = av_mallocz(sizeof(*pkt));
|
|
|
|
err = av_new_packet(pkt, text_len);
|
|
|
|
if (err < 0) {
|
|
|
|
av_free(pkt);
|
|
|
|
return AVERROR(err);
|
|
|
|
}
|
|
|
|
|
|
|
|
memcpy(pkt->data, text, text_len);
|
|
|
|
|
|
|
|
if (id_len > 0) {
|
|
|
|
buf = av_packet_new_side_data(pkt,
|
|
|
|
AV_PKT_DATA_WEBVTT_IDENTIFIER,
|
|
|
|
id_len);
|
|
|
|
if (buf == NULL) {
|
|
|
|
av_free(pkt);
|
|
|
|
return AVERROR(ENOMEM);
|
|
|
|
}
|
|
|
|
memcpy(buf, id, id_len);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (settings_len > 0) {
|
|
|
|
buf = av_packet_new_side_data(pkt,
|
|
|
|
AV_PKT_DATA_WEBVTT_SETTINGS,
|
|
|
|
settings_len);
|
|
|
|
if (buf == NULL) {
|
|
|
|
av_free(pkt);
|
|
|
|
return AVERROR(ENOMEM);
|
|
|
|
}
|
|
|
|
memcpy(buf, settings, settings_len);
|
|
|
|
}
|
|
|
|
|
|
|
|
// Do we need this for subtitles?
|
|
|
|
// pkt->flags = AV_PKT_FLAG_KEY;
|
|
|
|
|
|
|
|
pkt->stream_index = st->index;
|
|
|
|
pkt->pts = timecode;
|
|
|
|
|
|
|
|
// Do we need this for subtitles?
|
|
|
|
// pkt->dts = timecode;
|
|
|
|
|
|
|
|
pkt->duration = duration;
|
|
|
|
pkt->pos = pos;
|
|
|
|
|
|
|
|
dynarray_add(&matroska->packets, &matroska->num_packets, pkt);
|
|
|
|
matroska->prev_pkt = pkt;
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2012-09-17 02:28:13 +03:00
|
|
|
static int matroska_parse_frame(MatroskaDemuxContext *matroska,
|
|
|
|
MatroskaTrack *track,
|
|
|
|
AVStream *st,
|
|
|
|
uint8_t *data, int pkt_size,
|
2012-09-20 21:37:26 +03:00
|
|
|
uint64_t timecode, uint64_t lace_duration,
|
2013-02-14 00:51:48 +03:00
|
|
|
int64_t pos, int is_keyframe,
|
2013-09-10 21:12:21 +03:00
|
|
|
uint8_t *additional, uint64_t additional_id, int additional_size,
|
2013-11-14 14:58:28 +03:00
|
|
|
int64_t discard_padding)
|
2012-09-17 02:28:13 +03:00
|
|
|
{
|
|
|
|
MatroskaTrackEncoding *encodings = track->encodings.elem;
|
|
|
|
uint8_t *pkt_data = data;
|
|
|
|
int offset = 0, res;
|
|
|
|
AVPacket *pkt;
|
|
|
|
|
2013-03-07 19:11:38 +03:00
|
|
|
if (encodings && !encodings->type && encodings->scope & 1) {
|
2012-09-17 02:28:13 +03:00
|
|
|
res = matroska_decode_buffer(&pkt_data, &pkt_size, track);
|
|
|
|
if (res < 0)
|
|
|
|
return res;
|
|
|
|
}
|
|
|
|
|
2013-05-27 10:44:27 +03:00
|
|
|
if (st->codec->codec_id == AV_CODEC_ID_WAVPACK) {
|
|
|
|
uint8_t *wv_data;
|
|
|
|
res = matroska_parse_wavpack(track, pkt_data, &wv_data, &pkt_size);
|
|
|
|
if (res < 0) {
|
|
|
|
av_log(matroska->ctx, AV_LOG_ERROR, "Error parsing a wavpack block.\n");
|
|
|
|
goto fail;
|
|
|
|
}
|
|
|
|
if (pkt_data != data)
|
|
|
|
av_freep(&pkt_data);
|
|
|
|
pkt_data = wv_data;
|
|
|
|
}
|
|
|
|
|
2012-09-17 02:28:13 +03:00
|
|
|
if (st->codec->codec_id == AV_CODEC_ID_PRORES)
|
|
|
|
offset = 8;
|
|
|
|
|
|
|
|
pkt = av_mallocz(sizeof(AVPacket));
|
|
|
|
/* XXX: prevent data copy... */
|
|
|
|
if (av_new_packet(pkt, pkt_size + offset) < 0) {
|
|
|
|
av_free(pkt);
|
2013-06-03 17:07:06 +03:00
|
|
|
res = AVERROR(ENOMEM);
|
|
|
|
goto fail;
|
2012-09-17 02:28:13 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
if (st->codec->codec_id == AV_CODEC_ID_PRORES) {
|
|
|
|
uint8_t *buf = pkt->data;
|
|
|
|
bytestream_put_be32(&buf, pkt_size);
|
|
|
|
bytestream_put_be32(&buf, MKBETAG('i', 'c', 'p', 'f'));
|
|
|
|
}
|
|
|
|
|
|
|
|
memcpy(pkt->data + offset, pkt_data, pkt_size);
|
|
|
|
|
|
|
|
if (pkt_data != data)
|
2013-06-03 17:05:09 +03:00
|
|
|
av_freep(&pkt_data);
|
2012-09-17 02:28:13 +03:00
|
|
|
|
|
|
|
pkt->flags = is_keyframe;
|
|
|
|
pkt->stream_index = st->index;
|
|
|
|
|
2013-02-14 00:51:48 +03:00
|
|
|
if (additional_size > 0) {
|
|
|
|
uint8_t *side_data = av_packet_new_side_data(pkt,
|
|
|
|
AV_PKT_DATA_MATROSKA_BLOCKADDITIONAL,
|
2013-02-14 02:55:25 +03:00
|
|
|
additional_size + 8);
|
2013-02-14 00:51:48 +03:00
|
|
|
if(side_data == NULL) {
|
2013-03-19 16:07:39 +03:00
|
|
|
av_free_packet(pkt);
|
|
|
|
av_free(pkt);
|
2013-02-14 00:51:48 +03:00
|
|
|
return AVERROR(ENOMEM);
|
|
|
|
}
|
2013-02-14 02:55:25 +03:00
|
|
|
AV_WB64(side_data, additional_id);
|
2013-02-14 00:51:48 +03:00
|
|
|
memcpy(side_data + 8, additional, additional_size);
|
|
|
|
}
|
|
|
|
|
2013-09-10 21:12:21 +03:00
|
|
|
if (discard_padding) {
|
|
|
|
uint8_t *side_data = av_packet_new_side_data(pkt,
|
|
|
|
AV_PKT_DATA_SKIP_SAMPLES,
|
|
|
|
10);
|
|
|
|
if(side_data == NULL) {
|
|
|
|
av_free_packet(pkt);
|
|
|
|
av_free(pkt);
|
|
|
|
return AVERROR(ENOMEM);
|
|
|
|
}
|
|
|
|
AV_WL32(side_data, 0);
|
|
|
|
AV_WL32(side_data + 4, av_rescale_q(discard_padding,
|
|
|
|
(AVRational){1, 1000000000},
|
|
|
|
(AVRational){1, st->codec->sample_rate}));
|
|
|
|
}
|
|
|
|
|
2012-09-17 02:28:13 +03:00
|
|
|
if (track->ms_compat)
|
|
|
|
pkt->dts = timecode;
|
|
|
|
else
|
|
|
|
pkt->pts = timecode;
|
|
|
|
pkt->pos = pos;
|
2012-09-20 21:37:26 +03:00
|
|
|
if (st->codec->codec_id == AV_CODEC_ID_SUBRIP) {
|
|
|
|
/*
|
|
|
|
* For backward compatibility.
|
|
|
|
* Historically, we have put subtitle duration
|
|
|
|
* in convergence_duration, on the off chance
|
|
|
|
* that the time_scale is less than 1us, which
|
|
|
|
* could result in a 32bit overflow on the
|
|
|
|
* normal duration field.
|
|
|
|
*/
|
|
|
|
pkt->convergence_duration = lace_duration;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (track->type != MATROSKA_TRACK_TYPE_SUBTITLE ||
|
|
|
|
lace_duration <= INT_MAX) {
|
|
|
|
/*
|
|
|
|
* For non subtitle tracks, just store the duration
|
|
|
|
* as normal.
|
|
|
|
*
|
|
|
|
* If it's a subtitle track and duration value does
|
|
|
|
* not overflow a uint32, then also store it normally.
|
|
|
|
*/
|
|
|
|
pkt->duration = lace_duration;
|
|
|
|
}
|
2012-09-17 02:28:13 +03:00
|
|
|
|
subtitles: introduce ASS codec id and use it.
Currently, we have a AV_CODEC_ID_SSA, which matches the way the ASS/SSA
markup is muxed in a standalone .ass/.ssa file. This means the AVPacket
data starts with a "Dialogue:" string, followed by a timing information
(start and end of the event as string) and a trailing CRLF after each
line. One packet can contain several lines. We'll refer to this layout
as "SSA" or "SSA lines".
In matroska, this markup is not stored as such: it has no "Dialogue:"
prefix, it contains a ReadOrder field, the timing information is not in
the payload, and it doesn't contain the trailing CRLF. See [1] for more
info. We'll refer to this layout as "ASS".
Since we have only one common codec for both formats, the matroska
demuxer is constructing an AVPacket following the "SSA lines" format.
This causes several problems, so it was decided to change this into
clean ASS packets.
Some insight about what is changed or unchanged in this commit:
CODECS
------
- the decoding process still writes "SSA lines" markup inside the ass
fields of the subtitles rectangles (sub->rects[n]->ass), which is
still the current common way of representing decoded subtitles
markup. It is meant to change later.
- new ASS codec id: AV_CODEC_ID_ASS (which is different from the
legacy AV_CODEC_ID_SSA)
- lavc/assdec: the "ass" decoder is renamed into "ssa" (instead of
"ass") for consistency with the codec id and allows to add a real
ass decoder. This ass decoder receives clean ASS lines (so it starts
with a ReadOrder, is followed by the Layer, etc). We make sure this
is decoded properly in a new ass-line rectangle of the decoded
subtitles (the ssa decoder OTOH is doing a simple straightforward
copy). Using the packet timing instead of data string makes sure the
ass-line now contains the appropriate timing.
- lavc/assenc: just like the ass decoder, the "ssa" encoder is renamed
into "ssa" (instead of "ass") for consistency with the codec id, and
allows to add a real "ass" encoder.
One important thing about this encoder is that it only supports one
ass rectangle: we could have put several dialogue events in the
AVPacket (separated by a \0 for instance) but this would have cause
trouble for the muxer which needs not only the start time, but also
the duration: typically, you have merged events with the same start
time (stored in the AVPacket->pts) but a different duration. At the
moment, only the matroska do the merge with the SSA-line codec.
We will need to make sure all the decoders in the future can't add
more than one rectangle (and only one Dialogue line in it
obviously).
FORMATS
-------
- lavf/assenc: the .ass/.ssa muxer can take both SSA and ASS packets.
In the case of ASS packets as input, it adds the timing based on the
AVPacket pts and duration, and mux it with "Dialogue:", trailing
CRLF, etc.
- lavf/assdec: unchanged; it currently still only outputs SSA-lines
packets.
- lavf/mkv: the demuxer can now output ASS packets without the need of
any "SSA-lines" reconstruction hack. It will become the default at
next libavformat bump, and the SSA support will be dropped from the
demuxer. The muxer can take ASS packets since it's muxed normally,
and still supports the old SSA packets. All the SSA support and
hacks in Matroska code will be dropped at next lavf bump.
[1]: http://www.matroska.org/technical/specs/subtitles/ssa.html
2013-01-03 05:06:43 +03:00
|
|
|
#if FF_API_ASS_SSA
|
2012-09-17 02:28:13 +03:00
|
|
|
if (st->codec->codec_id == AV_CODEC_ID_SSA)
|
2012-09-20 21:37:26 +03:00
|
|
|
matroska_fix_ass_packet(matroska, pkt, lace_duration);
|
2012-09-17 02:28:13 +03:00
|
|
|
|
|
|
|
if (matroska->prev_pkt &&
|
|
|
|
timecode != AV_NOPTS_VALUE &&
|
|
|
|
matroska->prev_pkt->pts == timecode &&
|
|
|
|
matroska->prev_pkt->stream_index == st->index &&
|
|
|
|
st->codec->codec_id == AV_CODEC_ID_SSA)
|
|
|
|
matroska_merge_packets(matroska->prev_pkt, pkt);
|
|
|
|
else {
|
|
|
|
dynarray_add(&matroska->packets,&matroska->num_packets,pkt);
|
|
|
|
matroska->prev_pkt = pkt;
|
|
|
|
}
|
subtitles: introduce ASS codec id and use it.
Currently, we have a AV_CODEC_ID_SSA, which matches the way the ASS/SSA
markup is muxed in a standalone .ass/.ssa file. This means the AVPacket
data starts with a "Dialogue:" string, followed by a timing information
(start and end of the event as string) and a trailing CRLF after each
line. One packet can contain several lines. We'll refer to this layout
as "SSA" or "SSA lines".
In matroska, this markup is not stored as such: it has no "Dialogue:"
prefix, it contains a ReadOrder field, the timing information is not in
the payload, and it doesn't contain the trailing CRLF. See [1] for more
info. We'll refer to this layout as "ASS".
Since we have only one common codec for both formats, the matroska
demuxer is constructing an AVPacket following the "SSA lines" format.
This causes several problems, so it was decided to change this into
clean ASS packets.
Some insight about what is changed or unchanged in this commit:
CODECS
------
- the decoding process still writes "SSA lines" markup inside the ass
fields of the subtitles rectangles (sub->rects[n]->ass), which is
still the current common way of representing decoded subtitles
markup. It is meant to change later.
- new ASS codec id: AV_CODEC_ID_ASS (which is different from the
legacy AV_CODEC_ID_SSA)
- lavc/assdec: the "ass" decoder is renamed into "ssa" (instead of
"ass") for consistency with the codec id and allows to add a real
ass decoder. This ass decoder receives clean ASS lines (so it starts
with a ReadOrder, is followed by the Layer, etc). We make sure this
is decoded properly in a new ass-line rectangle of the decoded
subtitles (the ssa decoder OTOH is doing a simple straightforward
copy). Using the packet timing instead of data string makes sure the
ass-line now contains the appropriate timing.
- lavc/assenc: just like the ass decoder, the "ssa" encoder is renamed
into "ssa" (instead of "ass") for consistency with the codec id, and
allows to add a real "ass" encoder.
One important thing about this encoder is that it only supports one
ass rectangle: we could have put several dialogue events in the
AVPacket (separated by a \0 for instance) but this would have cause
trouble for the muxer which needs not only the start time, but also
the duration: typically, you have merged events with the same start
time (stored in the AVPacket->pts) but a different duration. At the
moment, only the matroska do the merge with the SSA-line codec.
We will need to make sure all the decoders in the future can't add
more than one rectangle (and only one Dialogue line in it
obviously).
FORMATS
-------
- lavf/assenc: the .ass/.ssa muxer can take both SSA and ASS packets.
In the case of ASS packets as input, it adds the timing based on the
AVPacket pts and duration, and mux it with "Dialogue:", trailing
CRLF, etc.
- lavf/assdec: unchanged; it currently still only outputs SSA-lines
packets.
- lavf/mkv: the demuxer can now output ASS packets without the need of
any "SSA-lines" reconstruction hack. It will become the default at
next libavformat bump, and the SSA support will be dropped from the
demuxer. The muxer can take ASS packets since it's muxed normally,
and still supports the old SSA packets. All the SSA support and
hacks in Matroska code will be dropped at next lavf bump.
[1]: http://www.matroska.org/technical/specs/subtitles/ssa.html
2013-01-03 05:06:43 +03:00
|
|
|
#else
|
|
|
|
dynarray_add(&matroska->packets, &matroska->num_packets, pkt);
|
|
|
|
matroska->prev_pkt = pkt;
|
|
|
|
#endif
|
2012-09-17 02:28:13 +03:00
|
|
|
|
|
|
|
return 0;
|
2013-05-27 10:44:27 +03:00
|
|
|
fail:
|
|
|
|
if (pkt_data != data)
|
|
|
|
av_freep(&pkt_data);
|
|
|
|
return res;
|
2012-09-17 02:28:13 +03:00
|
|
|
}
|
|
|
|
|
2008-08-05 03:42:05 +03:00
|
|
|
static int matroska_parse_block(MatroskaDemuxContext *matroska, uint8_t *data,
|
|
|
|
int size, int64_t pos, uint64_t cluster_time,
|
2012-09-17 03:48:02 +03:00
|
|
|
uint64_t block_duration, int is_keyframe,
|
2013-02-14 00:51:48 +03:00
|
|
|
uint8_t *additional, uint64_t additional_id, int additional_size,
|
2013-11-14 14:58:28 +03:00
|
|
|
int64_t cluster_pos, int64_t discard_padding)
|
2007-06-05 01:10:54 +03:00
|
|
|
{
|
2008-09-09 14:54:35 +03:00
|
|
|
uint64_t timecode = AV_NOPTS_VALUE;
|
2008-08-05 03:40:12 +03:00
|
|
|
MatroskaTrack *track;
|
2008-09-07 02:44:29 +03:00
|
|
|
int res = 0;
|
2007-06-05 01:10:54 +03:00
|
|
|
AVStream *st;
|
|
|
|
int16_t block_time;
|
|
|
|
uint32_t *lace_size = NULL;
|
|
|
|
int n, flags, laces = 0;
|
|
|
|
uint64_t num;
|
2013-07-15 18:13:45 +03:00
|
|
|
int trust_default_duration = 1;
|
2007-06-05 01:10:54 +03:00
|
|
|
|
2008-08-05 03:42:52 +03:00
|
|
|
if ((n = matroska_ebmlnum_uint(matroska, data, size, &num)) < 0) {
|
2007-06-05 01:10:54 +03:00
|
|
|
av_log(matroska->ctx, AV_LOG_ERROR, "EBML block data error\n");
|
2012-04-30 03:39:31 +03:00
|
|
|
return n;
|
2007-06-05 01:10:54 +03:00
|
|
|
}
|
|
|
|
data += n;
|
|
|
|
size -= n;
|
|
|
|
|
|
|
|
track = matroska_find_track_by_num(matroska, num);
|
2011-10-30 02:17:51 +03:00
|
|
|
if (!track || !track->stream) {
|
2007-06-05 01:10:54 +03:00
|
|
|
av_log(matroska->ctx, AV_LOG_INFO,
|
2008-08-05 03:40:12 +03:00
|
|
|
"Invalid stream %"PRIu64" or size %u\n", num, size);
|
2012-02-14 01:06:19 +03:00
|
|
|
return AVERROR_INVALIDDATA;
|
2011-10-30 02:17:51 +03:00
|
|
|
} else if (size <= 3)
|
|
|
|
return 0;
|
2008-08-05 03:40:12 +03:00
|
|
|
st = track->stream;
|
2008-08-05 03:41:10 +03:00
|
|
|
if (st->discard >= AVDISCARD_ALL)
|
2007-06-05 01:10:54 +03:00
|
|
|
return res;
|
2012-09-20 22:46:35 +03:00
|
|
|
av_assert1(block_duration != AV_NOPTS_VALUE);
|
2007-06-05 01:10:54 +03:00
|
|
|
|
2013-05-20 00:38:01 +03:00
|
|
|
block_time = sign_extend(AV_RB16(data), 16);
|
2007-06-05 01:10:54 +03:00
|
|
|
data += 2;
|
2007-06-23 15:49:36 +03:00
|
|
|
flags = *data++;
|
|
|
|
size -= 3;
|
2007-06-05 01:10:54 +03:00
|
|
|
if (is_keyframe == -1)
|
2010-03-31 15:29:58 +03:00
|
|
|
is_keyframe = flags & 0x80 ? AV_PKT_FLAG_KEY : 0;
|
2007-06-05 01:10:54 +03:00
|
|
|
|
2008-09-09 14:54:35 +03:00
|
|
|
if (cluster_time != (uint64_t)-1
|
|
|
|
&& (block_time >= 0 || cluster_time >= -block_time)) {
|
|
|
|
timecode = cluster_time + block_time;
|
2008-09-09 15:07:10 +03:00
|
|
|
if (track->type == MATROSKA_TRACK_TYPE_SUBTITLE
|
|
|
|
&& timecode < track->end_timecode)
|
|
|
|
is_keyframe = 0; /* overlapping subtitles are not key frame */
|
2008-09-12 03:06:06 +03:00
|
|
|
if (is_keyframe)
|
2008-09-09 14:54:35 +03:00
|
|
|
av_add_index_entry(st, cluster_pos, timecode, 0,0,AVINDEX_KEYFRAME);
|
|
|
|
}
|
|
|
|
|
2008-09-09 15:10:25 +03:00
|
|
|
if (matroska->skip_to_keyframe && track->type != MATROSKA_TRACK_TYPE_SUBTITLE) {
|
2012-04-14 01:17:30 +03:00
|
|
|
if (timecode < matroska->skip_to_timecode)
|
2007-06-05 01:10:54 +03:00
|
|
|
return res;
|
2013-09-11 09:00:31 +03:00
|
|
|
if (is_keyframe)
|
|
|
|
matroska->skip_to_keyframe = 0;
|
|
|
|
else if (!st->skip_to_keyframe) {
|
2012-04-14 01:17:30 +03:00
|
|
|
av_log(matroska->ctx, AV_LOG_ERROR, "File is broken, keyframes not correctly marked!\n");
|
|
|
|
matroska->skip_to_keyframe = 0;
|
|
|
|
}
|
2007-06-05 01:10:54 +03:00
|
|
|
}
|
|
|
|
|
2013-03-27 00:12:30 +03:00
|
|
|
res = matroska_parse_laces(matroska, &data, &size, (flags & 0x06) >> 1,
|
2012-09-17 02:58:32 +03:00
|
|
|
&lace_size, &laces);
|
2007-06-05 01:10:54 +03:00
|
|
|
|
2012-09-17 02:28:13 +03:00
|
|
|
if (res)
|
|
|
|
goto end;
|
2007-06-05 01:10:54 +03:00
|
|
|
|
2013-07-15 18:13:45 +03:00
|
|
|
if (track->audio.samplerate == 8000) {
|
|
|
|
// If this is needed for more codecs, then add them here
|
|
|
|
if (st->codec->codec_id == AV_CODEC_ID_AC3) {
|
|
|
|
if(track->audio.samplerate != st->codec->sample_rate || !st->codec->frame_size)
|
|
|
|
trust_default_duration = 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!block_duration && trust_default_duration)
|
2012-09-20 22:46:35 +03:00
|
|
|
block_duration = track->default_duration * laces / matroska->time_scale;
|
2007-06-05 01:10:54 +03:00
|
|
|
|
2012-09-20 21:37:26 +03:00
|
|
|
if (cluster_time != (uint64_t)-1 && (block_time >= 0 || cluster_time >= -block_time))
|
2012-09-17 03:48:02 +03:00
|
|
|
track->end_timecode =
|
|
|
|
FFMAX(track->end_timecode, timecode + block_duration);
|
2012-09-14 19:51:49 +03:00
|
|
|
|
2012-09-17 02:28:13 +03:00
|
|
|
for (n = 0; n < laces; n++) {
|
2012-09-20 22:46:35 +03:00
|
|
|
int64_t lace_duration = block_duration*(n+1) / laces - block_duration*n / laces;
|
2012-09-15 01:59:05 +03:00
|
|
|
|
2012-09-20 21:37:26 +03:00
|
|
|
if (lace_size[n] > size) {
|
|
|
|
av_log(matroska->ctx, AV_LOG_ERROR, "Invalid packet size\n");
|
|
|
|
break;
|
|
|
|
}
|
matroskadec, matroskadec, srtenc: Read/Write duration for subtitles.
After much discussion and back-and-forth, we reached the conclusion
that matroska uses convergence_duration for subtitle duration because
a 32bit value isn't large enough to store the duration if sub-micro-second
timebases are used. Matroska may not be the only one that supports these
timebases, but it's certainly the only one that ffmpeg attempts to support
in this way.
The long term solution that we seemed to reach was that if we encounter
a matroska file with a sub-micro-second timebase, we should internally
scale it up to at least micro-second, and then duration can be used
normally. This suggests that on the encode side, we should not allow
generation of files with sub-micro-second timebases, but that's a separate
issue.
That being a non-trivial change, and the subtitle interoperability breakage
being very real, I'm re-submitting this small change for consideration.
In this diff, we make sure that duration is populated by the matroska
demuxer, and that convergence_duration is respected in matroskaenc and
srtenc, but that duration is used otherwise. This ends up being a strict
improvement - pipelines that use convergence duration are unchanged, and
ones that are currently broken due to the duration mismatch will start
working - except for the ones with the extreme timebases, but those were
already broken.
Signed-off-by: Philip Langdale <philipl@overt.org>
2012-05-23 07:50:02 +03:00
|
|
|
|
2012-09-17 02:28:13 +03:00
|
|
|
if ((st->codec->codec_id == AV_CODEC_ID_RA_288 ||
|
|
|
|
st->codec->codec_id == AV_CODEC_ID_COOK ||
|
|
|
|
st->codec->codec_id == AV_CODEC_ID_SIPR ||
|
|
|
|
st->codec->codec_id == AV_CODEC_ID_ATRAC3) &&
|
|
|
|
st->codec->block_align && track->audio.sub_packet_size) {
|
2007-10-22 01:27:24 +03:00
|
|
|
|
2013-03-29 14:51:51 +03:00
|
|
|
res = matroska_parse_rm_audio(matroska, track, st, data,
|
|
|
|
lace_size[n],
|
2012-09-21 00:43:20 +03:00
|
|
|
timecode, pos);
|
2012-09-17 02:28:13 +03:00
|
|
|
if (res)
|
|
|
|
goto end;
|
2007-06-05 01:10:54 +03:00
|
|
|
|
2013-08-09 01:40:03 +03:00
|
|
|
} else if (st->codec->codec_id == AV_CODEC_ID_WEBVTT) {
|
|
|
|
res = matroska_parse_webvtt(matroska, track, st,
|
|
|
|
data, lace_size[n],
|
|
|
|
timecode, lace_duration,
|
|
|
|
pos);
|
|
|
|
if (res)
|
|
|
|
goto end;
|
|
|
|
|
2012-09-17 02:28:13 +03:00
|
|
|
} else {
|
|
|
|
res = matroska_parse_frame(matroska, track, st, data, lace_size[n],
|
2012-09-20 21:37:26 +03:00
|
|
|
timecode, lace_duration,
|
2013-02-14 00:51:48 +03:00
|
|
|
pos, !n? is_keyframe : 0,
|
2013-09-10 21:12:21 +03:00
|
|
|
additional, additional_id, additional_size,
|
|
|
|
discard_padding);
|
2012-09-17 02:28:13 +03:00
|
|
|
if (res)
|
|
|
|
goto end;
|
2007-06-05 01:10:54 +03:00
|
|
|
}
|
2012-09-17 02:28:13 +03:00
|
|
|
|
|
|
|
if (timecode != AV_NOPTS_VALUE)
|
2012-09-20 21:37:26 +03:00
|
|
|
timecode = lace_duration ? timecode + lace_duration : AV_NOPTS_VALUE;
|
2012-09-17 02:28:13 +03:00
|
|
|
data += lace_size[n];
|
|
|
|
size -= lace_size[n];
|
2007-06-05 01:10:54 +03:00
|
|
|
}
|
|
|
|
|
2012-04-13 07:24:04 +03:00
|
|
|
end:
|
2007-06-05 01:10:54 +03:00
|
|
|
av_free(lace_size);
|
2008-09-07 02:44:29 +03:00
|
|
|
return res;
|
2007-06-05 01:10:54 +03:00
|
|
|
}
|
|
|
|
|
2012-04-19 21:12:24 +03:00
|
|
|
static int matroska_parse_cluster_incremental(MatroskaDemuxContext *matroska)
|
|
|
|
{
|
|
|
|
EbmlList *blocks_list;
|
|
|
|
MatroskaBlock *blocks;
|
|
|
|
int i, res;
|
|
|
|
res = ebml_parse(matroska,
|
|
|
|
matroska_cluster_incremental_parsing,
|
|
|
|
&matroska->current_cluster);
|
|
|
|
if (res == 1) {
|
|
|
|
/* New Cluster */
|
|
|
|
if (matroska->current_cluster_pos)
|
|
|
|
ebml_level_end(matroska);
|
|
|
|
ebml_free(matroska_cluster, &matroska->current_cluster);
|
|
|
|
memset(&matroska->current_cluster, 0, sizeof(MatroskaCluster));
|
|
|
|
matroska->current_cluster_num_blocks = 0;
|
|
|
|
matroska->current_cluster_pos = avio_tell(matroska->ctx->pb);
|
|
|
|
matroska->prev_pkt = NULL;
|
|
|
|
/* sizeof the ID which was already read */
|
|
|
|
if (matroska->current_id)
|
|
|
|
matroska->current_cluster_pos -= 4;
|
|
|
|
res = ebml_parse(matroska,
|
|
|
|
matroska_clusters_incremental,
|
|
|
|
&matroska->current_cluster);
|
|
|
|
/* Try parsing the block again. */
|
|
|
|
if (res == 1)
|
|
|
|
res = ebml_parse(matroska,
|
|
|
|
matroska_cluster_incremental_parsing,
|
|
|
|
&matroska->current_cluster);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!res &&
|
|
|
|
matroska->current_cluster_num_blocks <
|
|
|
|
matroska->current_cluster.blocks.nb_elem) {
|
|
|
|
blocks_list = &matroska->current_cluster.blocks;
|
|
|
|
blocks = blocks_list->elem;
|
|
|
|
|
|
|
|
matroska->current_cluster_num_blocks = blocks_list->nb_elem;
|
|
|
|
i = blocks_list->nb_elem - 1;
|
|
|
|
if (blocks[i].bin.size > 0 && blocks[i].bin.data) {
|
|
|
|
int is_keyframe = blocks[i].non_simple ? !blocks[i].reference : -1;
|
2013-02-14 00:51:48 +03:00
|
|
|
uint8_t* additional = blocks[i].additional.size > 0 ?
|
|
|
|
blocks[i].additional.data : NULL;
|
2012-04-19 21:12:24 +03:00
|
|
|
if (!blocks[i].non_simple)
|
2012-04-24 01:19:55 +03:00
|
|
|
blocks[i].duration = 0;
|
2012-04-19 21:12:24 +03:00
|
|
|
res = matroska_parse_block(matroska,
|
|
|
|
blocks[i].bin.data, blocks[i].bin.size,
|
|
|
|
blocks[i].bin.pos,
|
|
|
|
matroska->current_cluster.timecode,
|
|
|
|
blocks[i].duration, is_keyframe,
|
2013-02-14 00:51:48 +03:00
|
|
|
additional, blocks[i].additional_id,
|
|
|
|
blocks[i].additional.size,
|
2013-09-10 21:12:21 +03:00
|
|
|
matroska->current_cluster_pos,
|
|
|
|
blocks[i].discard_padding);
|
2012-04-19 21:12:24 +03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return res;
|
|
|
|
}
|
|
|
|
|
2008-08-05 03:42:05 +03:00
|
|
|
static int matroska_parse_cluster(MatroskaDemuxContext *matroska)
|
2007-06-05 01:10:54 +03:00
|
|
|
{
|
2008-08-05 03:41:05 +03:00
|
|
|
MatroskaCluster cluster = { 0 };
|
|
|
|
EbmlList *blocks_list;
|
|
|
|
MatroskaBlock *blocks;
|
2008-09-07 02:39:59 +03:00
|
|
|
int i, res;
|
2012-04-19 21:12:24 +03:00
|
|
|
int64_t pos;
|
|
|
|
if (!matroska->contains_ssa)
|
|
|
|
return matroska_parse_cluster_incremental(matroska);
|
|
|
|
pos = avio_tell(matroska->ctx->pb);
|
2008-09-29 02:06:25 +03:00
|
|
|
matroska->prev_pkt = NULL;
|
2010-06-11 19:36:51 +03:00
|
|
|
if (matroska->current_id)
|
2008-08-25 03:09:08 +03:00
|
|
|
pos -= 4; /* sizeof the ID which was already read */
|
2010-06-11 19:45:38 +03:00
|
|
|
res = ebml_parse(matroska, matroska_clusters, &cluster);
|
2008-08-05 03:41:05 +03:00
|
|
|
blocks_list = &cluster.blocks;
|
|
|
|
blocks = blocks_list->elem;
|
2011-07-06 20:57:11 +03:00
|
|
|
for (i=0; i<blocks_list->nb_elem; i++)
|
2010-05-26 01:55:12 +03:00
|
|
|
if (blocks[i].bin.size > 0 && blocks[i].bin.data) {
|
2009-08-10 21:06:14 +03:00
|
|
|
int is_keyframe = blocks[i].non_simple ? !blocks[i].reference : -1;
|
2008-08-05 03:41:05 +03:00
|
|
|
res=matroska_parse_block(matroska,
|
|
|
|
blocks[i].bin.data, blocks[i].bin.size,
|
|
|
|
blocks[i].bin.pos, cluster.timecode,
|
2013-02-14 00:51:48 +03:00
|
|
|
blocks[i].duration, is_keyframe, NULL, 0, 0,
|
2013-09-10 21:12:21 +03:00
|
|
|
pos, blocks[i].discard_padding);
|
2009-08-10 21:06:14 +03:00
|
|
|
}
|
2008-08-05 03:41:05 +03:00
|
|
|
ebml_free(matroska_cluster, &cluster);
|
2007-06-05 01:10:54 +03:00
|
|
|
return res;
|
|
|
|
}
|
|
|
|
|
2008-08-05 03:42:05 +03:00
|
|
|
static int matroska_read_packet(AVFormatContext *s, AVPacket *pkt)
|
2007-06-05 01:10:54 +03:00
|
|
|
{
|
|
|
|
MatroskaDemuxContext *matroska = s->priv_data;
|
|
|
|
|
2011-07-06 20:57:11 +03:00
|
|
|
while (matroska_deliver_packet(matroska, pkt)) {
|
2012-02-14 01:06:19 +03:00
|
|
|
int64_t pos = avio_tell(matroska->ctx->pb);
|
2007-06-05 01:10:54 +03:00
|
|
|
if (matroska->done)
|
2009-02-19 23:01:45 +02:00
|
|
|
return AVERROR_EOF;
|
2012-02-14 01:06:19 +03:00
|
|
|
if (matroska_parse_cluster(matroska) < 0)
|
|
|
|
matroska_resync(matroska, pos);
|
2007-06-05 01:10:54 +03:00
|
|
|
}
|
|
|
|
|
2011-07-06 20:57:11 +03:00
|
|
|
return 0;
|
2007-06-05 01:10:54 +03:00
|
|
|
}
|
|
|
|
|
2008-08-05 03:42:05 +03:00
|
|
|
static int matroska_read_seek(AVFormatContext *s, int stream_index,
|
|
|
|
int64_t timestamp, int flags)
|
2007-06-05 01:10:54 +03:00
|
|
|
{
|
|
|
|
MatroskaDemuxContext *matroska = s->priv_data;
|
2008-09-09 15:10:25 +03:00
|
|
|
MatroskaTrack *tracks = matroska->tracks.elem;
|
2007-06-05 01:10:54 +03:00
|
|
|
AVStream *st = s->streams[stream_index];
|
2008-09-09 15:10:25 +03:00
|
|
|
int i, index, index_sub, index_min;
|
2007-06-05 01:10:54 +03:00
|
|
|
|
2011-07-09 08:48:43 +03:00
|
|
|
/* Parse the CUES now since we need the index data to seek. */
|
2012-02-12 16:09:03 +03:00
|
|
|
if (matroska->cues_parsing_deferred > 0) {
|
2011-07-09 08:48:43 +03:00
|
|
|
matroska->cues_parsing_deferred = 0;
|
2012-02-12 16:09:03 +03:00
|
|
|
matroska_parse_cues(matroska);
|
2011-07-09 08:48:43 +03:00
|
|
|
}
|
|
|
|
|
2008-09-12 03:06:06 +03:00
|
|
|
if (!st->nb_index_entries)
|
2012-02-12 16:09:03 +03:00
|
|
|
goto err;
|
2008-09-12 03:06:06 +03:00
|
|
|
timestamp = FFMAX(timestamp, st->index_entries[0].timestamp);
|
2008-08-25 02:57:29 +03:00
|
|
|
|
2008-08-27 22:57:42 +03:00
|
|
|
if ((index = av_index_search_timestamp(st, timestamp, flags)) < 0) {
|
2011-02-28 15:57:54 +02:00
|
|
|
avio_seek(s->pb, st->index_entries[st->nb_index_entries-1].pos, SEEK_SET);
|
2011-07-01 18:57:42 +03:00
|
|
|
matroska->current_id = 0;
|
2008-08-27 22:58:55 +03:00
|
|
|
while ((index = av_index_search_timestamp(st, timestamp, flags)) < 0) {
|
|
|
|
matroska_clear_queue(matroska);
|
|
|
|
if (matroska_parse_cluster(matroska) < 0)
|
|
|
|
break;
|
|
|
|
}
|
2008-08-27 22:57:42 +03:00
|
|
|
}
|
2007-06-05 01:10:54 +03:00
|
|
|
|
2007-12-29 20:35:38 +02:00
|
|
|
matroska_clear_queue(matroska);
|
2012-02-12 16:09:03 +03:00
|
|
|
if (index < 0 || (matroska->cues_parsing_deferred < 0 && index == st->nb_index_entries - 1))
|
|
|
|
goto err;
|
2007-12-29 20:35:38 +02:00
|
|
|
|
2008-09-09 15:10:25 +03:00
|
|
|
index_min = index;
|
|
|
|
for (i=0; i < matroska->tracks.nb_elem; i++) {
|
2011-02-26 13:52:01 +02:00
|
|
|
tracks[i].audio.pkt_cnt = 0;
|
|
|
|
tracks[i].audio.sub_packet_cnt = 0;
|
|
|
|
tracks[i].audio.buf_timecode = AV_NOPTS_VALUE;
|
2008-09-09 15:10:25 +03:00
|
|
|
tracks[i].end_timecode = 0;
|
|
|
|
if (tracks[i].type == MATROSKA_TRACK_TYPE_SUBTITLE
|
2012-10-20 17:58:33 +03:00
|
|
|
&& tracks[i].stream->discard != AVDISCARD_ALL) {
|
2008-09-09 15:10:25 +03:00
|
|
|
index_sub = av_index_search_timestamp(tracks[i].stream, st->index_entries[index].timestamp, AVSEEK_FLAG_BACKWARD);
|
2013-05-20 05:00:30 +03:00
|
|
|
while(index_sub >= 0
|
|
|
|
&& index_min >= 0
|
|
|
|
&& tracks[i].stream->index_entries[index_sub].pos < st->index_entries[index_min].pos
|
|
|
|
&& st->index_entries[index].timestamp - tracks[i].stream->index_entries[index_sub].timestamp < 30000000000/matroska->time_scale)
|
|
|
|
index_min--;
|
2008-09-09 15:10:25 +03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2011-02-28 15:57:54 +02:00
|
|
|
avio_seek(s->pb, st->index_entries[index_min].pos, SEEK_SET);
|
2011-07-01 18:57:42 +03:00
|
|
|
matroska->current_id = 0;
|
2013-02-07 23:34:35 +03:00
|
|
|
if (flags & AVSEEK_FLAG_ANY) {
|
|
|
|
st->skip_to_keyframe = 0;
|
|
|
|
matroska->skip_to_timecode = timestamp;
|
|
|
|
} else {
|
|
|
|
st->skip_to_keyframe = 1;
|
|
|
|
matroska->skip_to_timecode = st->index_entries[index].timestamp;
|
|
|
|
}
|
|
|
|
matroska->skip_to_keyframe = 1;
|
2008-08-25 03:17:31 +03:00
|
|
|
matroska->done = 0;
|
2012-02-12 16:07:04 +03:00
|
|
|
matroska->num_levels = 0;
|
2011-10-16 16:03:30 +03:00
|
|
|
ff_update_cur_dts(s, st, st->index_entries[index].timestamp);
|
2007-06-05 01:10:54 +03:00
|
|
|
return 0;
|
2012-02-12 16:09:03 +03:00
|
|
|
err:
|
|
|
|
// slightly hackish but allows proper fallback to
|
|
|
|
// the generic seeking code.
|
|
|
|
matroska_clear_queue(matroska);
|
|
|
|
matroska->current_id = 0;
|
2012-04-14 01:17:30 +03:00
|
|
|
st->skip_to_keyframe =
|
2012-02-12 16:09:03 +03:00
|
|
|
matroska->skip_to_keyframe = 0;
|
|
|
|
matroska->done = 0;
|
|
|
|
matroska->num_levels = 0;
|
|
|
|
return -1;
|
2007-06-05 01:10:54 +03:00
|
|
|
}
|
|
|
|
|
2008-08-05 03:42:05 +03:00
|
|
|
static int matroska_read_close(AVFormatContext *s)
|
2007-06-05 01:10:54 +03:00
|
|
|
{
|
|
|
|
MatroskaDemuxContext *matroska = s->priv_data;
|
2008-08-05 03:40:31 +03:00
|
|
|
MatroskaTrack *tracks = matroska->tracks.elem;
|
2008-08-05 03:41:13 +03:00
|
|
|
int n;
|
2007-06-05 01:10:54 +03:00
|
|
|
|
2007-12-29 20:32:47 +02:00
|
|
|
matroska_clear_queue(matroska);
|
2007-06-05 01:10:54 +03:00
|
|
|
|
2008-08-05 03:40:31 +03:00
|
|
|
for (n=0; n < matroska->tracks.nb_elem; n++)
|
|
|
|
if (tracks[n].type == MATROSKA_TRACK_TYPE_AUDIO)
|
|
|
|
av_free(tracks[n].audio.buf);
|
2012-04-19 21:12:24 +03:00
|
|
|
ebml_free(matroska_cluster, &matroska->current_cluster);
|
2008-08-05 03:40:58 +03:00
|
|
|
ebml_free(matroska_segment, matroska);
|
2007-06-05 01:10:54 +03:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2011-01-26 00:03:28 +02:00
|
|
|
AVInputFormat ff_matroska_demuxer = {
|
2011-07-16 23:18:12 +03:00
|
|
|
.name = "matroska,webm",
|
2012-07-25 00:51:41 +03:00
|
|
|
.long_name = NULL_IF_CONFIG_SMALL("Matroska / WebM"),
|
2011-07-16 23:18:12 +03:00
|
|
|
.priv_data_size = sizeof(MatroskaDemuxContext),
|
|
|
|
.read_probe = matroska_probe,
|
|
|
|
.read_header = matroska_read_header,
|
|
|
|
.read_packet = matroska_read_packet,
|
|
|
|
.read_close = matroska_read_close,
|
|
|
|
.read_seek = matroska_read_seek,
|
2007-06-05 01:10:54 +03:00
|
|
|
};
|