2007-09-05 02:22:37 +02:00
|
|
|
/*
|
2007-09-05 02:25:18 +02:00
|
|
|
* Matroska muxer
|
2007-09-05 02:22:37 +02:00
|
|
|
* Copyright (c) 2007 David Conrad
|
|
|
|
*
|
|
|
|
* 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
|
|
|
|
*/
|
|
|
|
|
2013-04-30 07:52:50 +02:00
|
|
|
#include "avc.h"
|
2007-09-05 02:22:37 +02:00
|
|
|
#include "avformat.h"
|
2013-07-15 22:20:57 +02:00
|
|
|
#include "avio_internal.h"
|
2013-04-30 07:52:50 +02:00
|
|
|
#include "avlanguage.h"
|
|
|
|
#include "flacenc.h"
|
2011-11-29 19:28:15 +01:00
|
|
|
#include "internal.h"
|
2008-07-27 17:11:04 +02:00
|
|
|
#include "isom.h"
|
2007-09-05 02:22:37 +02:00
|
|
|
#include "matroska.h"
|
2013-04-30 07:52:50 +02:00
|
|
|
#include "riff.h"
|
2013-05-28 10:09:21 +02:00
|
|
|
#include "wv.h"
|
2013-04-30 07:52:50 +02:00
|
|
|
|
|
|
|
#include "libavutil/avstring.h"
|
|
|
|
#include "libavutil/dict.h"
|
2011-11-27 15:04:16 +01:00
|
|
|
#include "libavutil/intfloat.h"
|
2013-04-30 07:52:50 +02:00
|
|
|
#include "libavutil/intreadwrite.h"
|
|
|
|
#include "libavutil/lfg.h"
|
2011-06-04 13:58:23 +02:00
|
|
|
#include "libavutil/mathematics.h"
|
2013-04-30 08:36:20 +02:00
|
|
|
#include "libavutil/opt.h"
|
2010-06-05 00:41:03 +02:00
|
|
|
#include "libavutil/random_seed.h"
|
2013-04-30 07:52:50 +02:00
|
|
|
#include "libavutil/samplefmt.h"
|
2013-05-03 13:09:23 +02:00
|
|
|
#include "libavutil/sha.h"
|
2013-04-30 07:52:50 +02:00
|
|
|
|
2008-05-09 13:56:36 +02:00
|
|
|
#include "libavcodec/xiph.h"
|
2008-04-02 23:41:48 +02:00
|
|
|
#include "libavcodec/mpeg4audio.h"
|
2007-09-05 02:22:37 +02:00
|
|
|
|
2007-09-05 02:24:56 +02:00
|
|
|
typedef struct ebml_master {
|
2008-10-03 12:16:29 +02:00
|
|
|
int64_t pos; ///< absolute offset in the file where the master's elements start
|
2007-09-05 02:24:56 +02:00
|
|
|
int sizebytes; ///< how many bytes were reserved for the size
|
|
|
|
} ebml_master;
|
|
|
|
|
2007-09-05 02:23:19 +02:00
|
|
|
typedef struct mkv_seekhead_entry {
|
|
|
|
unsigned int elementid;
|
|
|
|
uint64_t segmentpos;
|
|
|
|
} mkv_seekhead_entry;
|
|
|
|
|
|
|
|
typedef struct mkv_seekhead {
|
2008-10-03 12:16:29 +02:00
|
|
|
int64_t filepos;
|
|
|
|
int64_t segment_offset; ///< the file offset to the beginning of the segment
|
2007-09-05 02:23:26 +02:00
|
|
|
int reserved_size; ///< -1 if appending to file
|
2007-09-05 02:23:19 +02:00
|
|
|
int max_entries;
|
|
|
|
mkv_seekhead_entry *entries;
|
|
|
|
int num_entries;
|
|
|
|
} mkv_seekhead;
|
|
|
|
|
2007-09-05 02:23:27 +02:00
|
|
|
typedef struct {
|
|
|
|
uint64_t pts;
|
|
|
|
int tracknum;
|
2008-10-03 12:16:29 +02:00
|
|
|
int64_t cluster_pos; ///< file offset of the cluster containing the block
|
2013-07-23 09:52:08 +02:00
|
|
|
int64_t relative_pos; ///< relative offset from the position of the cluster containing the block
|
2007-09-05 02:23:27 +02:00
|
|
|
} mkv_cuepoint;
|
|
|
|
|
|
|
|
typedef struct {
|
2008-10-03 12:16:29 +02:00
|
|
|
int64_t segment_offset;
|
2007-09-05 02:23:27 +02:00
|
|
|
mkv_cuepoint *entries;
|
|
|
|
int num_entries;
|
|
|
|
} mkv_cues;
|
|
|
|
|
2010-03-09 05:23:28 +01:00
|
|
|
typedef struct {
|
|
|
|
int write_dts;
|
2013-02-10 21:32:37 +01:00
|
|
|
int has_cue;
|
2010-03-09 05:23:28 +01:00
|
|
|
} mkv_track;
|
|
|
|
|
2010-06-05 00:40:54 +02:00
|
|
|
#define MODE_MATROSKAv2 0x01
|
|
|
|
#define MODE_WEBM 0x02
|
|
|
|
|
2007-09-05 02:22:37 +02:00
|
|
|
typedef struct MatroskaMuxContext {
|
2013-04-30 08:36:20 +02:00
|
|
|
const AVClass *class;
|
2010-06-05 00:40:54 +02:00
|
|
|
int mode;
|
2011-02-20 11:04:12 +01:00
|
|
|
AVIOContext *dyn_bc;
|
2007-09-05 02:24:56 +02:00
|
|
|
ebml_master segment;
|
2008-10-03 12:16:29 +02:00
|
|
|
int64_t segment_offset;
|
2007-09-05 02:24:56 +02:00
|
|
|
ebml_master cluster;
|
2008-10-03 12:16:29 +02:00
|
|
|
int64_t cluster_pos; ///< file offset of the current cluster
|
2010-03-09 05:23:36 +01:00
|
|
|
int64_t cluster_pts;
|
2008-10-03 12:16:29 +02:00
|
|
|
int64_t duration_offset;
|
2010-03-09 05:23:36 +01:00
|
|
|
int64_t duration;
|
2007-09-05 02:23:19 +02:00
|
|
|
mkv_seekhead *main_seekhead;
|
2007-09-05 02:23:27 +02:00
|
|
|
mkv_cues *cues;
|
2010-03-09 05:23:28 +01:00
|
|
|
mkv_track *tracks;
|
2007-09-05 02:24:29 +02:00
|
|
|
|
2010-06-05 00:40:50 +02:00
|
|
|
AVPacket cur_audio_pkt;
|
2011-07-30 13:37:36 +02:00
|
|
|
|
|
|
|
int have_attachments;
|
2013-04-30 08:36:20 +02:00
|
|
|
|
|
|
|
int reserve_cues_space;
|
|
|
|
int64_t cues_pos;
|
2013-07-19 22:52:16 +02:00
|
|
|
|
|
|
|
uint32_t chapter_id_offset;
|
2007-09-05 02:22:37 +02:00
|
|
|
} MatroskaMuxContext;
|
|
|
|
|
2007-09-05 02:24:56 +02:00
|
|
|
|
2007-09-05 02:25:42 +02:00
|
|
|
/** 2 bytes * 3 for EBML IDs, 3 1-byte EBML lengths, 8 bytes for 64 bit
|
|
|
|
* offset, 4 bytes for target EBML ID */
|
2007-09-05 02:24:56 +02:00
|
|
|
#define MAX_SEEKENTRY_SIZE 21
|
|
|
|
|
2013-07-23 09:52:08 +02:00
|
|
|
/** per-cuepoint-track - 4 1-byte EBML IDs, 4 1-byte EBML sizes, 3
|
2007-09-05 02:25:42 +02:00
|
|
|
* 8-byte uint max */
|
2013-07-23 09:52:08 +02:00
|
|
|
#define MAX_CUETRACKPOS_SIZE 32
|
2007-09-05 02:24:56 +02:00
|
|
|
|
2007-09-05 02:25:42 +02:00
|
|
|
/** per-cuepoint - 2 1-byte EBML IDs, 2 1-byte EBML sizes, 8-byte uint max */
|
2007-09-05 02:24:56 +02:00
|
|
|
#define MAX_CUEPOINT_SIZE(num_tracks) 12 + MAX_CUETRACKPOS_SIZE*num_tracks
|
|
|
|
|
|
|
|
|
2007-09-05 02:24:34 +02:00
|
|
|
static int ebml_id_size(unsigned int id)
|
|
|
|
{
|
|
|
|
return (av_log2(id+1)-1)/7+1;
|
|
|
|
}
|
|
|
|
|
2011-02-20 11:04:12 +01:00
|
|
|
static void put_ebml_id(AVIOContext *pb, unsigned int id)
|
2007-09-05 02:22:37 +02:00
|
|
|
{
|
2007-09-05 02:24:36 +02:00
|
|
|
int i = ebml_id_size(id);
|
|
|
|
while (i--)
|
2012-10-15 16:01:14 +02:00
|
|
|
avio_w8(pb, (uint8_t)(id >> (i*8)));
|
2007-09-05 02:22:37 +02:00
|
|
|
}
|
|
|
|
|
2007-09-05 02:24:31 +02:00
|
|
|
/**
|
2007-09-05 22:31:40 +02:00
|
|
|
* Write an EBML size meaning "unknown size".
|
2007-09-05 02:24:31 +02:00
|
|
|
*
|
2007-09-05 22:31:40 +02:00
|
|
|
* @param bytes The number of bytes the size should occupy (maximum: 8).
|
2007-09-05 02:24:31 +02:00
|
|
|
*/
|
2011-02-20 11:04:12 +01:00
|
|
|
static void put_ebml_size_unknown(AVIOContext *pb, int bytes)
|
2007-09-05 02:24:31 +02:00
|
|
|
{
|
2012-07-13 17:03:57 +02:00
|
|
|
av_assert0(bytes <= 8);
|
2011-02-21 19:28:17 +01:00
|
|
|
avio_w8(pb, 0x1ff >> bytes);
|
2013-07-15 22:20:57 +02:00
|
|
|
ffio_fill(pb, 0xff, bytes - 1);
|
2007-09-05 02:24:31 +02:00
|
|
|
}
|
|
|
|
|
2007-09-05 02:24:42 +02:00
|
|
|
/**
|
2007-09-05 02:26:07 +02:00
|
|
|
* Calculate how many bytes are needed to represent a given number in EBML.
|
2007-09-05 02:24:42 +02:00
|
|
|
*/
|
2007-09-05 02:26:07 +02:00
|
|
|
static int ebml_num_size(uint64_t num)
|
2007-09-05 02:24:42 +02:00
|
|
|
{
|
|
|
|
int bytes = 1;
|
2007-09-05 02:26:07 +02:00
|
|
|
while ((num+1) >> bytes*7) bytes++;
|
2007-09-05 02:24:42 +02:00
|
|
|
return bytes;
|
|
|
|
}
|
|
|
|
|
2007-09-05 02:24:50 +02:00
|
|
|
/**
|
2007-09-05 02:26:07 +02:00
|
|
|
* Write a number in EBML variable length format.
|
2007-09-05 02:24:50 +02:00
|
|
|
*
|
2007-09-05 02:26:07 +02:00
|
|
|
* @param bytes The number of bytes that need to be used to write the number.
|
2007-09-05 02:24:50 +02:00
|
|
|
* If zero, any number of bytes can be used.
|
|
|
|
*/
|
2011-02-20 11:04:12 +01:00
|
|
|
static void put_ebml_num(AVIOContext *pb, uint64_t num, int bytes)
|
2007-09-05 02:22:37 +02:00
|
|
|
{
|
2007-09-05 02:26:07 +02:00
|
|
|
int i, needed_bytes = ebml_num_size(num);
|
2007-09-05 02:22:37 +02:00
|
|
|
|
|
|
|
// sizes larger than this are currently undefined in EBML
|
2012-07-13 17:03:57 +02:00
|
|
|
av_assert0(num < (1ULL<<56)-1);
|
2007-09-05 02:23:06 +02:00
|
|
|
|
2007-09-05 02:24:50 +02:00
|
|
|
if (bytes == 0)
|
|
|
|
// don't care how many bytes are used, so use the min
|
|
|
|
bytes = needed_bytes;
|
2007-09-05 02:25:24 +02:00
|
|
|
// the bytes needed to write the given size would exceed the bytes
|
|
|
|
// that we need to use, so write unknown size. This shouldn't happen.
|
2012-07-13 17:03:57 +02:00
|
|
|
av_assert0(bytes >= needed_bytes);
|
2007-09-05 02:24:50 +02:00
|
|
|
|
2007-09-05 02:26:07 +02:00
|
|
|
num |= 1ULL << bytes*7;
|
2007-09-05 02:24:44 +02:00
|
|
|
for (i = bytes - 1; i >= 0; i--)
|
2012-10-15 16:01:14 +02:00
|
|
|
avio_w8(pb, (uint8_t)(num >> i*8));
|
2007-09-05 02:22:37 +02:00
|
|
|
}
|
|
|
|
|
2011-02-20 11:04:12 +01:00
|
|
|
static void put_ebml_uint(AVIOContext *pb, unsigned int elementid, uint64_t val)
|
2007-09-05 02:22:37 +02:00
|
|
|
{
|
2007-09-05 02:24:39 +02:00
|
|
|
int i, bytes = 1;
|
2008-03-01 01:26:19 +01:00
|
|
|
uint64_t tmp = val;
|
|
|
|
while (tmp>>=8) bytes++;
|
2007-09-05 02:22:37 +02:00
|
|
|
|
|
|
|
put_ebml_id(pb, elementid);
|
2007-09-05 02:26:07 +02:00
|
|
|
put_ebml_num(pb, bytes, 0);
|
2007-09-05 02:24:39 +02:00
|
|
|
for (i = bytes - 1; i >= 0; i--)
|
2012-10-15 16:01:14 +02:00
|
|
|
avio_w8(pb, (uint8_t)(val >> i*8));
|
2007-09-05 02:22:37 +02:00
|
|
|
}
|
|
|
|
|
2011-02-20 11:04:12 +01:00
|
|
|
static void put_ebml_float(AVIOContext *pb, unsigned int elementid, double val)
|
2007-09-05 02:22:47 +02:00
|
|
|
{
|
|
|
|
put_ebml_id(pb, elementid);
|
2007-09-05 02:26:07 +02:00
|
|
|
put_ebml_num(pb, 8, 0);
|
2011-11-27 15:04:16 +01:00
|
|
|
avio_wb64(pb, av_double2int(val));
|
2007-09-05 02:22:47 +02:00
|
|
|
}
|
|
|
|
|
2011-02-20 11:04:12 +01:00
|
|
|
static void put_ebml_binary(AVIOContext *pb, unsigned int elementid,
|
2010-06-05 00:40:58 +02:00
|
|
|
const void *buf, int size)
|
2007-09-05 02:22:37 +02:00
|
|
|
{
|
|
|
|
put_ebml_id(pb, elementid);
|
2007-09-05 02:26:07 +02:00
|
|
|
put_ebml_num(pb, size, 0);
|
2011-02-21 19:28:17 +01:00
|
|
|
avio_write(pb, buf, size);
|
2007-09-05 02:22:37 +02:00
|
|
|
}
|
|
|
|
|
2011-02-20 11:04:12 +01:00
|
|
|
static void put_ebml_string(AVIOContext *pb, unsigned int elementid, const char *str)
|
2007-09-05 02:22:37 +02:00
|
|
|
{
|
|
|
|
put_ebml_binary(pb, elementid, str, strlen(str));
|
|
|
|
}
|
|
|
|
|
2007-09-05 02:24:25 +02:00
|
|
|
/**
|
2010-06-30 17:38:06 +02:00
|
|
|
* Write a void element of a given size. Useful for reserving space in
|
2007-09-05 02:25:16 +02:00
|
|
|
* the file to be written to later.
|
2007-09-05 02:24:25 +02:00
|
|
|
*
|
2007-09-05 02:25:04 +02:00
|
|
|
* @param size The number of bytes to reserve, which must be at least 2.
|
2007-09-05 02:24:25 +02:00
|
|
|
*/
|
2011-02-20 11:04:12 +01:00
|
|
|
static void put_ebml_void(AVIOContext *pb, uint64_t size)
|
2007-09-05 02:23:09 +02:00
|
|
|
{
|
2011-03-03 20:11:45 +01:00
|
|
|
int64_t currentpos = avio_tell(pb);
|
2007-09-05 02:23:09 +02:00
|
|
|
|
2012-07-13 17:03:57 +02:00
|
|
|
av_assert0(size >= 2);
|
2007-09-05 02:23:09 +02:00
|
|
|
|
|
|
|
put_ebml_id(pb, EBML_ID_VOID);
|
2007-09-05 02:25:16 +02:00
|
|
|
// we need to subtract the length needed to store the size from the
|
|
|
|
// size we need to reserve so 2 cases, we use 8 bytes to store the
|
|
|
|
// size if possible, 1 byte otherwise
|
2007-09-05 02:23:09 +02:00
|
|
|
if (size < 10)
|
2007-09-05 02:26:07 +02:00
|
|
|
put_ebml_num(pb, size-1, 0);
|
2007-09-05 02:23:09 +02:00
|
|
|
else
|
2007-09-05 02:26:07 +02:00
|
|
|
put_ebml_num(pb, size-9, 8);
|
2013-07-15 22:20:57 +02:00
|
|
|
ffio_fill(pb, 0, currentpos + size - avio_tell(pb));
|
2007-09-05 02:23:09 +02:00
|
|
|
}
|
|
|
|
|
2011-02-20 11:04:12 +01:00
|
|
|
static ebml_master start_ebml_master(AVIOContext *pb, unsigned int elementid, uint64_t expectedsize)
|
2007-09-05 02:22:37 +02:00
|
|
|
{
|
2007-09-05 02:26:07 +02:00
|
|
|
int bytes = expectedsize ? ebml_num_size(expectedsize) : 8;
|
2007-09-05 02:22:37 +02:00
|
|
|
put_ebml_id(pb, elementid);
|
2007-09-05 02:24:56 +02:00
|
|
|
put_ebml_size_unknown(pb, bytes);
|
2011-03-03 20:11:45 +01:00
|
|
|
return (ebml_master){ avio_tell(pb), bytes };
|
2007-09-05 02:22:37 +02:00
|
|
|
}
|
|
|
|
|
2011-02-20 11:04:12 +01:00
|
|
|
static void end_ebml_master(AVIOContext *pb, ebml_master master)
|
2007-09-05 02:22:37 +02:00
|
|
|
{
|
2011-03-03 20:11:45 +01:00
|
|
|
int64_t pos = avio_tell(pb);
|
2007-09-05 02:22:37 +02:00
|
|
|
|
2011-02-28 14:57:54 +01:00
|
|
|
if (avio_seek(pb, master.pos - master.sizebytes, SEEK_SET) < 0)
|
2007-09-05 02:26:00 +02:00
|
|
|
return;
|
2007-09-05 02:26:07 +02:00
|
|
|
put_ebml_num(pb, pos - master.pos, master.sizebytes);
|
2011-02-28 14:57:54 +01:00
|
|
|
avio_seek(pb, pos, SEEK_SET);
|
2007-09-05 02:22:37 +02:00
|
|
|
}
|
|
|
|
|
2011-02-20 11:04:12 +01:00
|
|
|
static void put_xiph_size(AVIOContext *pb, int size)
|
2007-09-05 02:24:06 +02:00
|
|
|
{
|
2013-07-15 22:20:57 +02:00
|
|
|
ffio_fill(pb, 255, size / 255);
|
2011-02-21 19:28:17 +01:00
|
|
|
avio_w8(pb, size % 255);
|
2007-09-05 02:24:06 +02:00
|
|
|
}
|
|
|
|
|
2007-09-05 02:24:25 +02:00
|
|
|
/**
|
2007-09-05 02:25:16 +02:00
|
|
|
* Initialize a mkv_seekhead element to be ready to index level 1 Matroska
|
|
|
|
* elements. If a maximum number of elements is specified, enough space
|
|
|
|
* will be reserved at the current file location to write a seek head of
|
|
|
|
* that size.
|
2007-09-05 02:24:25 +02:00
|
|
|
*
|
2007-09-05 02:25:16 +02:00
|
|
|
* @param segment_offset The absolute offset to the position in the file
|
2007-09-05 02:26:11 +02:00
|
|
|
* where the segment begins.
|
|
|
|
* @param numelements The maximum number of elements that will be indexed
|
2007-09-05 02:25:16 +02:00
|
|
|
* by this seek head, 0 if unlimited.
|
2007-09-05 02:24:25 +02:00
|
|
|
*/
|
2011-02-20 11:04:12 +01:00
|
|
|
static mkv_seekhead * mkv_start_seekhead(AVIOContext *pb, int64_t segment_offset, int numelements)
|
2007-09-05 02:23:19 +02:00
|
|
|
{
|
|
|
|
mkv_seekhead *new_seekhead = av_mallocz(sizeof(mkv_seekhead));
|
|
|
|
if (new_seekhead == NULL)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
new_seekhead->segment_offset = segment_offset;
|
|
|
|
|
|
|
|
if (numelements > 0) {
|
2011-03-03 20:11:45 +01:00
|
|
|
new_seekhead->filepos = avio_tell(pb);
|
2007-09-05 02:25:16 +02:00
|
|
|
// 21 bytes max for a seek entry, 10 bytes max for the SeekHead ID
|
|
|
|
// and size, and 3 bytes to guarantee that an EBML void element
|
|
|
|
// will fit afterwards
|
2007-09-05 02:24:56 +02:00
|
|
|
new_seekhead->reserved_size = numelements * MAX_SEEKENTRY_SIZE + 13;
|
2007-09-05 02:23:19 +02:00
|
|
|
new_seekhead->max_entries = numelements;
|
|
|
|
put_ebml_void(pb, new_seekhead->reserved_size);
|
|
|
|
}
|
|
|
|
return new_seekhead;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int mkv_add_seekhead_entry(mkv_seekhead *seekhead, unsigned int elementid, uint64_t filepos)
|
|
|
|
{
|
|
|
|
mkv_seekhead_entry *entries = seekhead->entries;
|
|
|
|
|
|
|
|
// don't store more elements than we reserved space for
|
|
|
|
if (seekhead->max_entries > 0 && seekhead->max_entries <= seekhead->num_entries)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
entries = av_realloc(entries, (seekhead->num_entries + 1) * sizeof(mkv_seekhead_entry));
|
|
|
|
if (entries == NULL)
|
2007-09-05 02:25:27 +02:00
|
|
|
return AVERROR(ENOMEM);
|
2007-09-05 02:23:19 +02:00
|
|
|
|
2007-09-05 02:25:44 +02:00
|
|
|
entries[seekhead->num_entries ].elementid = elementid;
|
|
|
|
entries[seekhead->num_entries++].segmentpos = filepos - seekhead->segment_offset;
|
2007-09-05 02:23:19 +02:00
|
|
|
|
|
|
|
seekhead->entries = entries;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2007-09-05 02:24:25 +02:00
|
|
|
/**
|
2007-09-05 02:25:16 +02:00
|
|
|
* Write the seek head to the file and free it. If a maximum number of
|
|
|
|
* elements was specified to mkv_start_seekhead(), the seek head will
|
|
|
|
* be written at the location reserved for it. Otherwise, it is written
|
|
|
|
* at the current location in the file.
|
2007-09-05 02:24:25 +02:00
|
|
|
*
|
2010-03-04 09:53:04 +01:00
|
|
|
* @return The file offset where the seekhead was written,
|
|
|
|
* -1 if an error occurred.
|
2007-09-05 02:24:25 +02:00
|
|
|
*/
|
2011-02-20 11:04:12 +01:00
|
|
|
static int64_t mkv_write_seekhead(AVIOContext *pb, mkv_seekhead *seekhead)
|
2007-09-05 02:23:19 +02:00
|
|
|
{
|
2007-09-05 02:24:56 +02:00
|
|
|
ebml_master metaseek, seekentry;
|
2008-10-03 12:16:29 +02:00
|
|
|
int64_t currentpos;
|
2007-09-05 02:23:19 +02:00
|
|
|
int i;
|
|
|
|
|
2011-03-03 20:11:45 +01:00
|
|
|
currentpos = avio_tell(pb);
|
2007-09-05 02:23:19 +02:00
|
|
|
|
2011-11-07 20:06:01 +01:00
|
|
|
if (seekhead->reserved_size > 0) {
|
|
|
|
if (avio_seek(pb, seekhead->filepos, SEEK_SET) < 0) {
|
|
|
|
currentpos = -1;
|
|
|
|
goto fail;
|
|
|
|
}
|
|
|
|
}
|
2007-09-05 02:23:19 +02:00
|
|
|
|
2007-09-05 02:24:56 +02:00
|
|
|
metaseek = start_ebml_master(pb, MATROSKA_ID_SEEKHEAD, seekhead->reserved_size);
|
2007-09-05 02:23:19 +02:00
|
|
|
for (i = 0; i < seekhead->num_entries; i++) {
|
|
|
|
mkv_seekhead_entry *entry = &seekhead->entries[i];
|
|
|
|
|
2007-09-05 02:24:56 +02:00
|
|
|
seekentry = start_ebml_master(pb, MATROSKA_ID_SEEKENTRY, MAX_SEEKENTRY_SIZE);
|
2007-09-05 02:23:19 +02:00
|
|
|
|
|
|
|
put_ebml_id(pb, MATROSKA_ID_SEEKID);
|
2007-09-05 02:26:07 +02:00
|
|
|
put_ebml_num(pb, ebml_id_size(entry->elementid), 0);
|
2007-09-05 02:23:19 +02:00
|
|
|
put_ebml_id(pb, entry->elementid);
|
|
|
|
|
|
|
|
put_ebml_uint(pb, MATROSKA_ID_SEEKPOSITION, entry->segmentpos);
|
|
|
|
end_ebml_master(pb, seekentry);
|
|
|
|
}
|
|
|
|
end_ebml_master(pb, metaseek);
|
|
|
|
|
|
|
|
if (seekhead->reserved_size > 0) {
|
2011-03-03 20:11:45 +01:00
|
|
|
uint64_t remaining = seekhead->filepos + seekhead->reserved_size - avio_tell(pb);
|
2007-09-05 02:23:19 +02:00
|
|
|
put_ebml_void(pb, remaining);
|
2011-02-28 14:57:54 +01:00
|
|
|
avio_seek(pb, currentpos, SEEK_SET);
|
2007-09-05 02:23:19 +02:00
|
|
|
|
|
|
|
currentpos = seekhead->filepos;
|
|
|
|
}
|
2011-11-07 20:06:01 +01:00
|
|
|
fail:
|
2007-09-05 02:23:19 +02:00
|
|
|
av_free(seekhead->entries);
|
|
|
|
av_free(seekhead);
|
|
|
|
|
|
|
|
return currentpos;
|
|
|
|
}
|
|
|
|
|
2008-10-03 12:16:29 +02:00
|
|
|
static mkv_cues * mkv_start_cues(int64_t segment_offset)
|
2007-09-05 02:23:27 +02:00
|
|
|
{
|
|
|
|
mkv_cues *cues = av_mallocz(sizeof(mkv_cues));
|
|
|
|
if (cues == NULL)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
cues->segment_offset = segment_offset;
|
|
|
|
return cues;
|
|
|
|
}
|
|
|
|
|
2013-07-23 09:52:08 +02:00
|
|
|
static int mkv_add_cuepoint(mkv_cues *cues, int stream, int64_t ts, int64_t cluster_pos, int64_t relative_pos)
|
2007-09-05 02:23:27 +02:00
|
|
|
{
|
|
|
|
mkv_cuepoint *entries = cues->entries;
|
|
|
|
|
2012-10-09 14:54:01 +02:00
|
|
|
if (ts < 0)
|
|
|
|
return 0;
|
|
|
|
|
2007-09-05 02:23:27 +02:00
|
|
|
entries = av_realloc(entries, (cues->num_entries + 1) * sizeof(mkv_cuepoint));
|
|
|
|
if (entries == NULL)
|
2007-09-05 02:25:27 +02:00
|
|
|
return AVERROR(ENOMEM);
|
2007-09-05 02:23:27 +02:00
|
|
|
|
2010-03-09 05:23:28 +01:00
|
|
|
entries[cues->num_entries ].pts = ts;
|
|
|
|
entries[cues->num_entries ].tracknum = stream + 1;
|
2013-07-23 09:52:08 +02:00
|
|
|
entries[cues->num_entries ].cluster_pos = cluster_pos - cues->segment_offset;
|
|
|
|
entries[cues->num_entries++].relative_pos = relative_pos;
|
2007-09-05 02:23:27 +02:00
|
|
|
|
|
|
|
cues->entries = entries;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2013-02-10 21:32:37 +01:00
|
|
|
static int64_t mkv_write_cues(AVIOContext *pb, mkv_cues *cues, mkv_track *tracks, int num_tracks)
|
2007-09-05 02:23:27 +02:00
|
|
|
{
|
2007-09-05 02:24:56 +02:00
|
|
|
ebml_master cues_element;
|
2008-10-03 12:16:29 +02:00
|
|
|
int64_t currentpos;
|
2007-09-05 02:23:27 +02:00
|
|
|
int i, j;
|
|
|
|
|
2011-03-03 20:11:45 +01:00
|
|
|
currentpos = avio_tell(pb);
|
2007-09-05 02:24:56 +02:00
|
|
|
cues_element = start_ebml_master(pb, MATROSKA_ID_CUES, 0);
|
2007-09-05 02:23:27 +02:00
|
|
|
|
|
|
|
for (i = 0; i < cues->num_entries; i++) {
|
2007-09-05 02:24:56 +02:00
|
|
|
ebml_master cuepoint, track_positions;
|
2007-09-05 02:23:27 +02:00
|
|
|
mkv_cuepoint *entry = &cues->entries[i];
|
|
|
|
uint64_t pts = entry->pts;
|
|
|
|
|
2007-09-05 02:24:56 +02:00
|
|
|
cuepoint = start_ebml_master(pb, MATROSKA_ID_POINTENTRY, MAX_CUEPOINT_SIZE(num_tracks));
|
2007-09-05 02:23:27 +02:00
|
|
|
put_ebml_uint(pb, MATROSKA_ID_CUETIME, pts);
|
|
|
|
|
|
|
|
// put all the entries from different tracks that have the exact same
|
|
|
|
// timestamp into the same CuePoint
|
2013-02-10 21:32:37 +01:00
|
|
|
for (j = 0; j < num_tracks; j++)
|
|
|
|
tracks[j].has_cue = 0;
|
2007-09-05 02:23:27 +02:00
|
|
|
for (j = 0; j < cues->num_entries - i && entry[j].pts == pts; j++) {
|
2013-02-23 23:05:44 +01:00
|
|
|
int tracknum = entry[j].tracknum - 1;
|
|
|
|
av_assert0(tracknum>=0 && tracknum<num_tracks);
|
|
|
|
if (tracks[tracknum].has_cue)
|
2013-02-10 21:32:37 +01:00
|
|
|
continue;
|
2013-02-23 23:05:44 +01:00
|
|
|
tracks[tracknum].has_cue = 1;
|
2007-09-05 02:24:56 +02:00
|
|
|
track_positions = start_ebml_master(pb, MATROSKA_ID_CUETRACKPOSITION, MAX_CUETRACKPOS_SIZE);
|
2013-07-23 09:52:08 +02:00
|
|
|
put_ebml_uint(pb, MATROSKA_ID_CUETRACK , entry[j].tracknum );
|
|
|
|
put_ebml_uint(pb, MATROSKA_ID_CUECLUSTERPOSITION , entry[j].cluster_pos);
|
|
|
|
put_ebml_uint(pb, MATROSKA_ID_CUERELATIVEPOSITION, entry[j].relative_pos);
|
2007-09-05 02:23:27 +02:00
|
|
|
end_ebml_master(pb, track_positions);
|
|
|
|
}
|
|
|
|
i += j - 1;
|
|
|
|
end_ebml_master(pb, cuepoint);
|
|
|
|
}
|
|
|
|
end_ebml_master(pb, cues_element);
|
|
|
|
|
|
|
|
return currentpos;
|
|
|
|
}
|
|
|
|
|
2011-02-20 11:04:12 +01:00
|
|
|
static int put_xiph_codecpriv(AVFormatContext *s, AVIOContext *pb, AVCodecContext *codec)
|
2007-09-05 02:23:13 +02:00
|
|
|
{
|
|
|
|
uint8_t *header_start[3];
|
|
|
|
int header_len[3];
|
|
|
|
int first_header_size;
|
2007-09-05 02:24:06 +02:00
|
|
|
int j;
|
2007-09-05 02:23:13 +02:00
|
|
|
|
2012-08-05 11:11:04 +02:00
|
|
|
if (codec->codec_id == AV_CODEC_ID_VORBIS)
|
2007-09-05 02:23:13 +02:00
|
|
|
first_header_size = 30;
|
|
|
|
else
|
|
|
|
first_header_size = 42;
|
|
|
|
|
2011-10-17 09:45:27 +02:00
|
|
|
if (avpriv_split_xiph_headers(codec->extradata, codec->extradata_size,
|
2007-09-05 02:23:13 +02:00
|
|
|
first_header_size, header_start, header_len) < 0) {
|
2007-09-05 02:26:09 +02:00
|
|
|
av_log(s, AV_LOG_ERROR, "Extradata corrupt.\n");
|
2007-09-05 02:23:13 +02:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2011-02-21 19:28:17 +01:00
|
|
|
avio_w8(pb, 2); // number packets - 1
|
2007-09-05 02:23:13 +02:00
|
|
|
for (j = 0; j < 2; j++) {
|
2007-09-05 02:24:06 +02:00
|
|
|
put_xiph_size(pb, header_len[j]);
|
2007-09-05 02:23:13 +02:00
|
|
|
}
|
|
|
|
for (j = 0; j < 3; j++)
|
2011-02-21 19:28:17 +01:00
|
|
|
avio_write(pb, header_start[j], header_len[j]);
|
2007-09-05 02:23:17 +02:00
|
|
|
|
|
|
|
return 0;
|
2007-09-05 02:23:13 +02:00
|
|
|
}
|
2007-09-05 02:22:37 +02:00
|
|
|
|
2013-05-28 10:09:21 +02:00
|
|
|
static int put_wv_codecpriv(AVIOContext *pb, AVCodecContext *codec)
|
|
|
|
{
|
|
|
|
if (codec->extradata && codec->extradata_size == 2)
|
|
|
|
avio_write(pb, codec->extradata, 2);
|
|
|
|
else
|
|
|
|
avio_wl16(pb, 0x403); // fallback to the version mentioned in matroska specs
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2007-09-05 02:26:09 +02:00
|
|
|
static void get_aac_sample_rates(AVFormatContext *s, AVCodecContext *codec, int *sample_rate, int *output_sample_rate)
|
2007-09-05 02:23:43 +02:00
|
|
|
{
|
2011-03-21 09:05:36 +01:00
|
|
|
MPEG4AudioConfig mp4ac;
|
2007-09-05 02:23:43 +02:00
|
|
|
|
2011-10-21 17:25:30 +02:00
|
|
|
if (avpriv_mpeg4audio_get_config(&mp4ac, codec->extradata,
|
|
|
|
codec->extradata_size * 8, 1) < 0) {
|
2011-03-21 09:05:36 +01:00
|
|
|
av_log(s, AV_LOG_WARNING, "Error parsing AAC extradata, unable to determine samplerate.\n");
|
2007-09-05 02:23:43 +02:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2011-03-21 09:05:36 +01:00
|
|
|
*sample_rate = mp4ac.sample_rate;
|
|
|
|
*output_sample_rate = mp4ac.ext_sample_rate;
|
2007-09-05 02:23:43 +02:00
|
|
|
}
|
|
|
|
|
2011-02-20 11:04:12 +01:00
|
|
|
static int mkv_write_codecprivate(AVFormatContext *s, AVIOContext *pb, AVCodecContext *codec, int native_id, int qt_id)
|
2007-09-05 02:25:49 +02:00
|
|
|
{
|
2011-02-20 11:04:12 +01:00
|
|
|
AVIOContext *dyn_cp;
|
2007-09-05 02:25:52 +02:00
|
|
|
uint8_t *codecpriv;
|
2007-11-21 08:41:00 +01:00
|
|
|
int ret, codecpriv_size;
|
2007-09-05 02:25:52 +02:00
|
|
|
|
2011-03-17 08:13:34 +01:00
|
|
|
ret = avio_open_dyn_buf(&dyn_cp);
|
2007-11-21 08:41:00 +01:00
|
|
|
if(ret < 0)
|
|
|
|
return ret;
|
2007-09-05 02:25:49 +02:00
|
|
|
|
|
|
|
if (native_id) {
|
2012-08-05 11:11:04 +02:00
|
|
|
if (codec->codec_id == AV_CODEC_ID_VORBIS || codec->codec_id == AV_CODEC_ID_THEORA)
|
2007-11-21 08:41:00 +01:00
|
|
|
ret = put_xiph_codecpriv(s, dyn_cp, codec);
|
2012-08-05 11:11:04 +02:00
|
|
|
else if (codec->codec_id == AV_CODEC_ID_FLAC)
|
2010-03-20 14:36:43 +01:00
|
|
|
ret = ff_flac_write_header(dyn_cp, codec, 1);
|
2013-05-28 10:09:21 +02:00
|
|
|
else if (codec->codec_id == AV_CODEC_ID_WAVPACK)
|
|
|
|
ret = put_wv_codecpriv(dyn_cp, codec);
|
2012-08-05 11:11:04 +02:00
|
|
|
else if (codec->codec_id == AV_CODEC_ID_H264)
|
2008-01-12 00:33:32 +01:00
|
|
|
ret = ff_isom_write_avcc(dyn_cp, codec->extradata, codec->extradata_size);
|
2012-09-14 22:26:14 +02:00
|
|
|
else if (codec->codec_id == AV_CODEC_ID_ALAC) {
|
|
|
|
if (codec->extradata_size < 36) {
|
|
|
|
av_log(s, AV_LOG_ERROR,
|
|
|
|
"Invalid extradata found, ALAC expects a 36-byte "
|
|
|
|
"QuickTime atom.");
|
|
|
|
ret = AVERROR_INVALIDDATA;
|
|
|
|
} else
|
|
|
|
avio_write(dyn_cp, codec->extradata + 12,
|
|
|
|
codec->extradata_size - 12);
|
|
|
|
}
|
2013-01-24 12:50:41 +01:00
|
|
|
else if (codec->extradata_size && codec->codec_id != AV_CODEC_ID_TTA)
|
2011-02-21 19:28:17 +01:00
|
|
|
avio_write(dyn_cp, codec->extradata, codec->extradata_size);
|
2010-03-31 01:30:55 +02:00
|
|
|
} else if (codec->codec_type == AVMEDIA_TYPE_VIDEO) {
|
2008-07-27 17:11:04 +02:00
|
|
|
if (qt_id) {
|
|
|
|
if (!codec->codec_tag)
|
2012-02-15 10:28:39 +01:00
|
|
|
codec->codec_tag = ff_codec_get_tag(ff_codec_movvideo_tags, codec->codec_id);
|
2008-07-27 17:11:04 +02:00
|
|
|
if (codec->extradata_size)
|
2011-02-21 19:28:17 +01:00
|
|
|
avio_write(dyn_cp, codec->extradata, codec->extradata_size);
|
2008-07-27 17:11:04 +02:00
|
|
|
} else {
|
2010-03-04 09:53:11 +01:00
|
|
|
if (!codec->codec_tag)
|
|
|
|
codec->codec_tag = ff_codec_get_tag(ff_codec_bmp_tags, codec->codec_id);
|
|
|
|
if (!codec->codec_tag) {
|
2013-02-10 18:02:59 +01:00
|
|
|
av_log(s, AV_LOG_ERROR, "No bmp codec tag found for codec %s\n",
|
|
|
|
avcodec_get_name(codec->codec_id));
|
|
|
|
ret = AVERROR(EINVAL);
|
2010-03-04 09:53:11 +01:00
|
|
|
}
|
2007-09-05 02:25:49 +02:00
|
|
|
|
2010-03-04 09:53:11 +01:00
|
|
|
ff_put_bmp_header(dyn_cp, codec, ff_codec_bmp_tags, 0);
|
2008-07-27 17:11:04 +02:00
|
|
|
}
|
2007-09-05 02:25:49 +02:00
|
|
|
|
2010-03-31 01:30:55 +02:00
|
|
|
} else if (codec->codec_type == AVMEDIA_TYPE_AUDIO) {
|
2010-03-25 15:34:19 +01:00
|
|
|
unsigned int tag;
|
|
|
|
tag = ff_codec_get_tag(ff_codec_wav_tags, codec->codec_id);
|
|
|
|
if (!tag) {
|
2013-02-10 18:02:59 +01:00
|
|
|
av_log(s, AV_LOG_ERROR, "No wav codec tag found for codec %s\n",
|
|
|
|
avcodec_get_name(codec->codec_id));
|
|
|
|
ret = AVERROR(EINVAL);
|
2007-09-05 02:25:49 +02:00
|
|
|
}
|
2010-03-25 15:34:19 +01:00
|
|
|
if (!codec->codec_tag)
|
|
|
|
codec->codec_tag = tag;
|
2007-09-05 02:25:49 +02:00
|
|
|
|
2009-06-23 01:09:34 +02:00
|
|
|
ff_put_wav_header(dyn_cp, codec);
|
2007-09-05 02:25:49 +02:00
|
|
|
}
|
2007-09-05 02:25:52 +02:00
|
|
|
|
2011-03-17 08:16:07 +01:00
|
|
|
codecpriv_size = avio_close_dyn_buf(dyn_cp, &codecpriv);
|
2007-09-05 02:25:52 +02:00
|
|
|
if (codecpriv_size)
|
|
|
|
put_ebml_binary(pb, MATROSKA_ID_CODECPRIVATE, codecpriv, codecpriv_size);
|
|
|
|
av_free(codecpriv);
|
|
|
|
return ret;
|
2007-09-05 02:25:49 +02:00
|
|
|
}
|
|
|
|
|
2007-09-05 02:23:15 +02:00
|
|
|
static int mkv_write_tracks(AVFormatContext *s)
|
2007-09-05 02:22:37 +02:00
|
|
|
{
|
|
|
|
MatroskaMuxContext *mkv = s->priv_data;
|
2011-02-20 11:04:12 +01:00
|
|
|
AVIOContext *pb = s->pb;
|
2007-09-05 02:24:56 +02:00
|
|
|
ebml_master tracks;
|
2013-01-30 10:28:53 +01:00
|
|
|
int i, j, ret, default_stream_exists = 0;
|
2007-09-05 02:22:37 +02:00
|
|
|
|
2011-03-03 20:11:45 +01:00
|
|
|
ret = mkv_add_seekhead_entry(mkv->main_seekhead, MATROSKA_ID_TRACKS, avio_tell(pb));
|
2007-09-05 02:25:32 +02:00
|
|
|
if (ret < 0) return ret;
|
2007-09-05 02:23:19 +02:00
|
|
|
|
2007-09-05 02:24:56 +02:00
|
|
|
tracks = start_ebml_master(pb, MATROSKA_ID_TRACKS, 0);
|
2013-01-30 10:28:53 +01:00
|
|
|
for (i = 0; i < s->nb_streams; i++) {
|
|
|
|
AVStream *st = s->streams[i];
|
|
|
|
default_stream_exists |= st->disposition & AV_DISPOSITION_DEFAULT;
|
|
|
|
}
|
2007-09-05 02:22:37 +02:00
|
|
|
for (i = 0; i < s->nb_streams; i++) {
|
|
|
|
AVStream *st = s->streams[i];
|
2007-09-05 02:22:50 +02:00
|
|
|
AVCodecContext *codec = st->codec;
|
2007-09-05 02:24:56 +02:00
|
|
|
ebml_master subinfo, track;
|
2007-09-05 02:22:50 +02:00
|
|
|
int native_id = 0;
|
2008-07-27 17:11:04 +02:00
|
|
|
int qt_id = 0;
|
2007-09-05 02:23:34 +02:00
|
|
|
int bit_depth = av_get_bits_per_sample(codec->codec_id);
|
2007-09-05 02:23:43 +02:00
|
|
|
int sample_rate = codec->sample_rate;
|
|
|
|
int output_sample_rate = 0;
|
2011-05-22 12:46:29 +02:00
|
|
|
AVDictionaryEntry *tag;
|
2007-09-05 02:23:43 +02:00
|
|
|
|
2011-07-30 13:37:36 +02:00
|
|
|
if (codec->codec_type == AVMEDIA_TYPE_ATTACHMENT) {
|
|
|
|
mkv->have_attachments = 1;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
2007-09-05 02:25:14 +02:00
|
|
|
if (!bit_depth)
|
2011-06-07 19:40:22 +02:00
|
|
|
bit_depth = av_get_bytes_per_sample(codec->sample_fmt) << 3;
|
2013-01-24 12:58:51 +01:00
|
|
|
if (!bit_depth)
|
|
|
|
bit_depth = codec->bits_per_coded_sample;
|
2007-09-05 02:25:14 +02:00
|
|
|
|
2012-08-05 11:11:04 +02:00
|
|
|
if (codec->codec_id == AV_CODEC_ID_AAC)
|
2007-09-05 02:26:09 +02:00
|
|
|
get_aac_sample_rates(s, codec, &sample_rate, &output_sample_rate);
|
2007-09-05 02:22:50 +02:00
|
|
|
|
2007-09-05 02:24:56 +02:00
|
|
|
track = start_ebml_master(pb, MATROSKA_ID_TRACKENTRY, 0);
|
2007-09-05 02:23:03 +02:00
|
|
|
put_ebml_uint (pb, MATROSKA_ID_TRACKNUMBER , i + 1);
|
|
|
|
put_ebml_uint (pb, MATROSKA_ID_TRACKUID , i + 1);
|
2007-09-05 02:22:50 +02:00
|
|
|
put_ebml_uint (pb, MATROSKA_ID_TRACKFLAGLACING , 0); // no lacing (yet)
|
|
|
|
|
2011-05-22 12:46:29 +02:00
|
|
|
if ((tag = av_dict_get(st->metadata, "title", NULL, 0)))
|
2009-02-15 17:53:05 +01:00
|
|
|
put_ebml_string(pb, MATROSKA_ID_TRACKNAME, tag->value);
|
2011-05-22 12:46:29 +02:00
|
|
|
tag = av_dict_get(st->metadata, "language", NULL, 0);
|
2013-07-09 01:25:30 +02:00
|
|
|
if (mkv->mode != MODE_WEBM || codec->codec_id != AV_CODEC_ID_WEBVTT) {
|
|
|
|
put_ebml_string(pb, MATROSKA_ID_TRACKLANGUAGE, tag ? tag->value:"und");
|
|
|
|
} else if (tag && tag->value) {
|
|
|
|
put_ebml_string(pb, MATROSKA_ID_TRACKLANGUAGE, tag->value);
|
|
|
|
}
|
2007-09-05 02:22:50 +02:00
|
|
|
|
2013-01-30 10:28:53 +01:00
|
|
|
if (default_stream_exists) {
|
2009-01-17 05:31:42 +01:00
|
|
|
put_ebml_uint(pb, MATROSKA_ID_TRACKFLAGDEFAULT, !!(st->disposition & AV_DISPOSITION_DEFAULT));
|
2013-01-30 10:28:53 +01:00
|
|
|
}
|
2013-01-27 23:24:52 +01:00
|
|
|
if (st->disposition & AV_DISPOSITION_FORCED)
|
|
|
|
put_ebml_uint(pb, MATROSKA_ID_TRACKFLAGFORCED, 1);
|
2008-03-07 20:25:09 +01:00
|
|
|
|
2013-07-09 01:25:30 +02:00
|
|
|
if (mkv->mode == MODE_WEBM && codec->codec_id == AV_CODEC_ID_WEBVTT) {
|
|
|
|
const char *codec_id;
|
|
|
|
if (st->disposition & AV_DISPOSITION_CAPTIONS) {
|
|
|
|
codec_id = "D_WEBVTT/CAPTIONS";
|
|
|
|
native_id = MATROSKA_TRACK_TYPE_SUBTITLE;
|
|
|
|
} else if (st->disposition & AV_DISPOSITION_DESCRIPTIONS) {
|
|
|
|
codec_id = "D_WEBVTT/DESCRIPTIONS";
|
|
|
|
native_id = MATROSKA_TRACK_TYPE_METADATA;
|
|
|
|
} else if (st->disposition & AV_DISPOSITION_METADATA) {
|
|
|
|
codec_id = "D_WEBVTT/METADATA";
|
|
|
|
native_id = MATROSKA_TRACK_TYPE_METADATA;
|
|
|
|
} else {
|
|
|
|
codec_id = "D_WEBVTT/SUBTITLES";
|
|
|
|
native_id = MATROSKA_TRACK_TYPE_SUBTITLE;
|
|
|
|
}
|
|
|
|
put_ebml_string(pb, MATROSKA_ID_CODECID, codec_id);
|
|
|
|
} else {
|
|
|
|
// look for a codec ID string specific to mkv to use,
|
|
|
|
// if none are found, use AVI codes
|
|
|
|
for (j = 0; ff_mkv_codec_tags[j].id != AV_CODEC_ID_NONE; j++) {
|
|
|
|
if (ff_mkv_codec_tags[j].id == codec->codec_id) {
|
|
|
|
put_ebml_string(pb, MATROSKA_ID_CODECID, ff_mkv_codec_tags[j].str);
|
|
|
|
native_id = 1;
|
|
|
|
break;
|
|
|
|
}
|
2007-09-05 02:22:50 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-08-05 11:11:04 +02:00
|
|
|
if (mkv->mode == MODE_WEBM && !(codec->codec_id == AV_CODEC_ID_VP8 ||
|
2013-06-02 17:49:24 +02:00
|
|
|
codec->codec_id == AV_CODEC_ID_VP9 ||
|
|
|
|
((codec->codec_id == AV_CODEC_ID_OPUS)&&(codec->strict_std_compliance <= FF_COMPLIANCE_EXPERIMENTAL)) ||
|
2013-07-09 01:25:30 +02:00
|
|
|
codec->codec_id == AV_CODEC_ID_VORBIS ||
|
|
|
|
codec->codec_id == AV_CODEC_ID_WEBVTT)) {
|
2010-06-05 00:40:54 +02:00
|
|
|
av_log(s, AV_LOG_ERROR,
|
2013-07-09 01:25:30 +02:00
|
|
|
"Only VP8,VP9 video and Vorbis,Opus(experimental, use -strict -2) audio and WebVTT subtitles are supported for WebM.\n");
|
2010-06-05 00:40:54 +02:00
|
|
|
return AVERROR(EINVAL);
|
|
|
|
}
|
|
|
|
|
2007-09-05 02:22:50 +02:00
|
|
|
switch (codec->codec_type) {
|
2010-03-31 01:30:55 +02:00
|
|
|
case AVMEDIA_TYPE_VIDEO:
|
2007-09-05 02:22:50 +02:00
|
|
|
put_ebml_uint(pb, MATROSKA_ID_TRACKTYPE, MATROSKA_TRACK_TYPE_VIDEO);
|
2011-11-05 23:43:29 +01:00
|
|
|
if(st->avg_frame_rate.num && st->avg_frame_rate.den && 1.0/av_q2d(st->avg_frame_rate) > av_q2d(codec->time_base))
|
|
|
|
put_ebml_uint(pb, MATROSKA_ID_TRACKDEFAULTDURATION, 1E9/av_q2d(st->avg_frame_rate));
|
|
|
|
else
|
|
|
|
put_ebml_uint(pb, MATROSKA_ID_TRACKDEFAULTDURATION, av_q2d(codec->time_base)*1E9);
|
2007-09-05 02:22:50 +02:00
|
|
|
|
2008-07-27 17:11:04 +02:00
|
|
|
if (!native_id &&
|
2012-02-15 10:28:39 +01:00
|
|
|
ff_codec_get_tag(ff_codec_movvideo_tags, codec->codec_id) &&
|
2009-06-23 01:09:34 +02:00
|
|
|
(!ff_codec_get_tag(ff_codec_bmp_tags, codec->codec_id)
|
2012-08-05 11:11:04 +02:00
|
|
|
|| codec->codec_id == AV_CODEC_ID_SVQ1
|
|
|
|
|| codec->codec_id == AV_CODEC_ID_SVQ3
|
|
|
|
|| codec->codec_id == AV_CODEC_ID_CINEPAK))
|
2008-07-27 17:11:04 +02:00
|
|
|
qt_id = 1;
|
|
|
|
|
|
|
|
if (qt_id)
|
|
|
|
put_ebml_string(pb, MATROSKA_ID_CODECID, "V_QUICKTIME");
|
2010-03-09 05:23:28 +01:00
|
|
|
else if (!native_id) {
|
2007-09-05 02:26:11 +02:00
|
|
|
// if there is no mkv-specific codec ID, use VFW mode
|
2008-08-05 02:42:49 +02:00
|
|
|
put_ebml_string(pb, MATROSKA_ID_CODECID, "V_MS/VFW/FOURCC");
|
2010-03-09 05:23:28 +01:00
|
|
|
mkv->tracks[i].write_dts = 1;
|
|
|
|
}
|
2007-09-05 02:25:58 +02:00
|
|
|
|
2007-09-05 02:24:56 +02:00
|
|
|
subinfo = start_ebml_master(pb, MATROSKA_ID_TRACKVIDEO, 0);
|
2007-09-05 02:22:50 +02:00
|
|
|
// XXX: interlace flag?
|
|
|
|
put_ebml_uint (pb, MATROSKA_ID_VIDEOPIXELWIDTH , codec->width);
|
|
|
|
put_ebml_uint (pb, MATROSKA_ID_VIDEOPIXELHEIGHT, codec->height);
|
2011-05-21 17:14:14 +02:00
|
|
|
|
2011-06-09 04:47:19 +02:00
|
|
|
if ((tag = av_dict_get(st->metadata, "stereo_mode", NULL, 0)) ||
|
|
|
|
(tag = av_dict_get( s->metadata, "stereo_mode", NULL, 0))) {
|
2011-05-24 01:09:24 +02:00
|
|
|
// save stereo mode flag
|
|
|
|
uint64_t st_mode = MATROSKA_VIDEO_STEREO_MODE_COUNT;
|
|
|
|
|
|
|
|
for (j=0; j<MATROSKA_VIDEO_STEREO_MODE_COUNT; j++)
|
2012-09-16 02:58:40 +02:00
|
|
|
if (!strcmp(tag->value, ff_matroska_video_stereo_mode[j])){
|
2011-05-24 01:09:24 +02:00
|
|
|
st_mode = j;
|
2011-05-21 17:08:53 +02:00
|
|
|
break;
|
2011-05-24 01:09:24 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
if ((mkv->mode == MODE_WEBM && st_mode > 3 && st_mode != 11)
|
|
|
|
|| st_mode >= MATROSKA_VIDEO_STEREO_MODE_COUNT) {
|
|
|
|
av_log(s, AV_LOG_ERROR,
|
|
|
|
"The specified stereo mode is not valid.\n");
|
|
|
|
return AVERROR(EINVAL);
|
|
|
|
} else
|
|
|
|
put_ebml_uint(pb, MATROSKA_ID_VIDEOSTEREOMODE, st_mode);
|
2011-04-24 07:29:13 +02:00
|
|
|
}
|
2011-05-21 17:08:53 +02:00
|
|
|
|
2013-05-09 01:59:32 +02:00
|
|
|
if ((tag = av_dict_get(st->metadata, "alpha_mode", NULL, 0)) ||
|
|
|
|
(tag = av_dict_get( s->metadata, "alpha_mode", NULL, 0)) ||
|
|
|
|
(codec->pix_fmt == AV_PIX_FMT_YUVA420P)) {
|
|
|
|
put_ebml_uint(pb, MATROSKA_ID_VIDEOALPHAMODE, 1);
|
|
|
|
}
|
|
|
|
|
2008-08-24 01:43:20 +02:00
|
|
|
if (st->sample_aspect_ratio.num) {
|
2012-12-12 21:19:24 +01:00
|
|
|
int64_t d_width = av_rescale(codec->width, st->sample_aspect_ratio.num, st->sample_aspect_ratio.den);
|
|
|
|
if (d_width > INT_MAX) {
|
|
|
|
av_log(s, AV_LOG_ERROR, "Overflow in display width\n");
|
|
|
|
return AVERROR(EINVAL);
|
|
|
|
}
|
2008-08-24 01:43:20 +02:00
|
|
|
put_ebml_uint(pb, MATROSKA_ID_VIDEODISPLAYWIDTH , d_width);
|
|
|
|
put_ebml_uint(pb, MATROSKA_ID_VIDEODISPLAYHEIGHT, codec->height);
|
2007-09-05 02:24:15 +02:00
|
|
|
}
|
2011-06-13 18:37:32 +02:00
|
|
|
|
2012-08-07 22:45:46 +02:00
|
|
|
if (codec->codec_id == AV_CODEC_ID_RAWVIDEO) {
|
2011-06-14 01:53:40 +02:00
|
|
|
uint32_t color_space = av_le2ne32(codec->codec_tag);
|
|
|
|
put_ebml_binary(pb, MATROSKA_ID_VIDEOCOLORSPACE, &color_space, sizeof(color_space));
|
|
|
|
}
|
2007-09-05 02:22:50 +02:00
|
|
|
end_ebml_master(pb, subinfo);
|
|
|
|
break;
|
|
|
|
|
2010-03-31 01:30:55 +02:00
|
|
|
case AVMEDIA_TYPE_AUDIO:
|
2007-09-05 02:22:50 +02:00
|
|
|
put_ebml_uint(pb, MATROSKA_ID_TRACKTYPE, MATROSKA_TRACK_TYPE_AUDIO);
|
|
|
|
|
2007-09-05 02:25:58 +02:00
|
|
|
if (!native_id)
|
2007-09-05 02:23:29 +02:00
|
|
|
// no mkv-specific ID, use ACM mode
|
2008-08-05 02:42:49 +02:00
|
|
|
put_ebml_string(pb, MATROSKA_ID_CODECID, "A_MS/ACM");
|
2007-09-05 02:25:58 +02:00
|
|
|
|
2007-09-05 02:24:56 +02:00
|
|
|
subinfo = start_ebml_master(pb, MATROSKA_ID_TRACKAUDIO, 0);
|
2007-09-05 02:22:50 +02:00
|
|
|
put_ebml_uint (pb, MATROSKA_ID_AUDIOCHANNELS , codec->channels);
|
2007-09-05 02:23:43 +02:00
|
|
|
put_ebml_float (pb, MATROSKA_ID_AUDIOSAMPLINGFREQ, sample_rate);
|
|
|
|
if (output_sample_rate)
|
|
|
|
put_ebml_float(pb, MATROSKA_ID_AUDIOOUTSAMPLINGFREQ, output_sample_rate);
|
2007-09-05 02:23:31 +02:00
|
|
|
if (bit_depth)
|
|
|
|
put_ebml_uint(pb, MATROSKA_ID_AUDIOBITDEPTH, bit_depth);
|
2007-09-05 02:22:50 +02:00
|
|
|
end_ebml_master(pb, subinfo);
|
|
|
|
break;
|
|
|
|
|
2010-03-31 01:30:55 +02:00
|
|
|
case AVMEDIA_TYPE_SUBTITLE:
|
2011-03-24 01:56:26 +01:00
|
|
|
if (!native_id) {
|
|
|
|
av_log(s, AV_LOG_ERROR, "Subtitle codec %d is not supported.\n", codec->codec_id);
|
2011-03-24 01:56:26 +01:00
|
|
|
return AVERROR(ENOSYS);
|
2011-03-24 01:56:26 +01:00
|
|
|
}
|
2013-07-09 01:25:30 +02:00
|
|
|
|
|
|
|
if (mkv->mode != MODE_WEBM || codec->codec_id != AV_CODEC_ID_WEBVTT)
|
|
|
|
native_id = MATROSKA_TRACK_TYPE_SUBTITLE;
|
|
|
|
|
|
|
|
put_ebml_uint(pb, MATROSKA_ID_TRACKTYPE, native_id);
|
2007-09-05 02:25:24 +02:00
|
|
|
break;
|
2007-09-05 02:22:50 +02:00
|
|
|
default:
|
2011-03-24 01:54:15 +01:00
|
|
|
av_log(s, AV_LOG_ERROR, "Only audio, video, and subtitles are supported for Matroska.\n");
|
2013-04-29 20:45:22 +02:00
|
|
|
return AVERROR(EINVAL);
|
2007-09-05 02:22:50 +02:00
|
|
|
}
|
2013-07-09 01:25:30 +02:00
|
|
|
|
|
|
|
if (mkv->mode != MODE_WEBM || codec->codec_id != AV_CODEC_ID_WEBVTT) {
|
|
|
|
ret = mkv_write_codecprivate(s, pb, codec, native_id, qt_id);
|
|
|
|
if (ret < 0) return ret;
|
|
|
|
}
|
2007-09-05 02:25:49 +02:00
|
|
|
|
2007-09-05 02:22:37 +02:00
|
|
|
end_ebml_master(pb, track);
|
2007-09-05 02:22:50 +02:00
|
|
|
|
|
|
|
// ms precision is the de-facto standard timescale for mkv files
|
2011-11-29 19:28:15 +01:00
|
|
|
avpriv_set_pts_info(st, 64, 1, 1000);
|
2007-09-05 02:22:37 +02:00
|
|
|
}
|
|
|
|
end_ebml_master(pb, tracks);
|
2007-09-05 02:23:17 +02:00
|
|
|
return 0;
|
2007-09-05 02:23:15 +02:00
|
|
|
}
|
|
|
|
|
2009-10-18 14:17:01 +02:00
|
|
|
static int mkv_write_chapters(AVFormatContext *s)
|
|
|
|
{
|
|
|
|
MatroskaMuxContext *mkv = s->priv_data;
|
2011-02-20 11:04:12 +01:00
|
|
|
AVIOContext *pb = s->pb;
|
2009-10-18 14:17:01 +02:00
|
|
|
ebml_master chapters, editionentry;
|
|
|
|
AVRational scale = {1, 1E9};
|
|
|
|
int i, ret;
|
|
|
|
|
|
|
|
if (!s->nb_chapters)
|
|
|
|
return 0;
|
|
|
|
|
2011-03-03 20:11:45 +01:00
|
|
|
ret = mkv_add_seekhead_entry(mkv->main_seekhead, MATROSKA_ID_CHAPTERS, avio_tell(pb));
|
2009-10-18 14:17:01 +02:00
|
|
|
if (ret < 0) return ret;
|
|
|
|
|
|
|
|
chapters = start_ebml_master(pb, MATROSKA_ID_CHAPTERS , 0);
|
|
|
|
editionentry = start_ebml_master(pb, MATROSKA_ID_EDITIONENTRY, 0);
|
|
|
|
put_ebml_uint(pb, MATROSKA_ID_EDITIONFLAGDEFAULT, 1);
|
|
|
|
put_ebml_uint(pb, MATROSKA_ID_EDITIONFLAGHIDDEN , 0);
|
|
|
|
for (i = 0; i < s->nb_chapters; i++) {
|
|
|
|
ebml_master chapteratom, chapterdisplay;
|
|
|
|
AVChapter *c = s->chapters[i];
|
2011-05-22 12:46:29 +02:00
|
|
|
AVDictionaryEntry *t = NULL;
|
2009-10-18 14:17:01 +02:00
|
|
|
|
|
|
|
chapteratom = start_ebml_master(pb, MATROSKA_ID_CHAPTERATOM, 0);
|
2013-07-19 22:52:16 +02:00
|
|
|
put_ebml_uint(pb, MATROSKA_ID_CHAPTERUID, c->id + mkv->chapter_id_offset);
|
2009-10-18 14:17:01 +02:00
|
|
|
put_ebml_uint(pb, MATROSKA_ID_CHAPTERTIMESTART,
|
|
|
|
av_rescale_q(c->start, c->time_base, scale));
|
|
|
|
put_ebml_uint(pb, MATROSKA_ID_CHAPTERTIMEEND,
|
|
|
|
av_rescale_q(c->end, c->time_base, scale));
|
|
|
|
put_ebml_uint(pb, MATROSKA_ID_CHAPTERFLAGHIDDEN , 0);
|
|
|
|
put_ebml_uint(pb, MATROSKA_ID_CHAPTERFLAGENABLED, 1);
|
2011-05-22 12:46:29 +02:00
|
|
|
if ((t = av_dict_get(c->metadata, "title", NULL, 0))) {
|
2009-10-18 14:17:01 +02:00
|
|
|
chapterdisplay = start_ebml_master(pb, MATROSKA_ID_CHAPTERDISPLAY, 0);
|
|
|
|
put_ebml_string(pb, MATROSKA_ID_CHAPSTRING, t->value);
|
|
|
|
put_ebml_string(pb, MATROSKA_ID_CHAPLANG , "und");
|
|
|
|
end_ebml_master(pb, chapterdisplay);
|
|
|
|
}
|
|
|
|
end_ebml_master(pb, chapteratom);
|
|
|
|
}
|
|
|
|
end_ebml_master(pb, editionentry);
|
|
|
|
end_ebml_master(pb, chapters);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2011-05-22 12:46:29 +02:00
|
|
|
static void mkv_write_simpletag(AVIOContext *pb, AVDictionaryEntry *t)
|
2010-10-05 11:40:43 +02:00
|
|
|
{
|
|
|
|
uint8_t *key = av_strdup(t->key);
|
|
|
|
uint8_t *p = key;
|
|
|
|
const uint8_t *lang = NULL;
|
|
|
|
ebml_master tag;
|
|
|
|
|
|
|
|
if ((p = strrchr(p, '-')) &&
|
|
|
|
(lang = av_convert_lang_to(p + 1, AV_LANG_ISO639_2_BIBL)))
|
|
|
|
*p = 0;
|
|
|
|
|
|
|
|
p = key;
|
|
|
|
while (*p) {
|
|
|
|
if (*p == ' ')
|
|
|
|
*p = '_';
|
|
|
|
else if (*p >= 'a' && *p <= 'z')
|
|
|
|
*p -= 'a' - 'A';
|
|
|
|
p++;
|
|
|
|
}
|
|
|
|
|
|
|
|
tag = start_ebml_master(pb, MATROSKA_ID_SIMPLETAG, 0);
|
|
|
|
put_ebml_string(pb, MATROSKA_ID_TAGNAME, key);
|
|
|
|
if (lang)
|
|
|
|
put_ebml_string(pb, MATROSKA_ID_TAGLANG, lang);
|
|
|
|
put_ebml_string(pb, MATROSKA_ID_TAGSTRING, t->value);
|
|
|
|
end_ebml_master(pb, tag);
|
|
|
|
|
|
|
|
av_freep(&key);
|
|
|
|
}
|
|
|
|
|
2011-05-22 12:46:29 +02:00
|
|
|
static int mkv_write_tag(AVFormatContext *s, AVDictionary *m, unsigned int elementid,
|
2010-10-05 11:40:43 +02:00
|
|
|
unsigned int uid, ebml_master *tags)
|
|
|
|
{
|
|
|
|
MatroskaMuxContext *mkv = s->priv_data;
|
|
|
|
ebml_master tag, targets;
|
2011-05-22 12:46:29 +02:00
|
|
|
AVDictionaryEntry *t = NULL;
|
2010-10-05 11:40:43 +02:00
|
|
|
int ret;
|
|
|
|
|
|
|
|
if (!tags->pos) {
|
2011-03-03 20:11:45 +01:00
|
|
|
ret = mkv_add_seekhead_entry(mkv->main_seekhead, MATROSKA_ID_TAGS, avio_tell(s->pb));
|
2010-10-05 11:40:43 +02:00
|
|
|
if (ret < 0) return ret;
|
|
|
|
|
|
|
|
*tags = start_ebml_master(s->pb, MATROSKA_ID_TAGS, 0);
|
|
|
|
}
|
|
|
|
|
|
|
|
tag = start_ebml_master(s->pb, MATROSKA_ID_TAG, 0);
|
|
|
|
targets = start_ebml_master(s->pb, MATROSKA_ID_TAGTARGETS, 0);
|
|
|
|
if (elementid)
|
|
|
|
put_ebml_uint(s->pb, elementid, uid);
|
|
|
|
end_ebml_master(s->pb, targets);
|
|
|
|
|
2011-05-22 12:46:29 +02:00
|
|
|
while ((t = av_dict_get(m, "", t, AV_DICT_IGNORE_SUFFIX)))
|
2011-11-02 20:17:25 +01:00
|
|
|
if (av_strcasecmp(t->key, "title") && av_strcasecmp(t->key, "stereo_mode"))
|
2010-11-23 09:24:41 +01:00
|
|
|
mkv_write_simpletag(s->pb, t);
|
2010-10-05 11:40:43 +02:00
|
|
|
|
|
|
|
end_ebml_master(s->pb, tag);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2013-07-17 08:10:16 +02:00
|
|
|
static int mkv_check_tag(AVDictionary *m)
|
|
|
|
{
|
|
|
|
AVDictionaryEntry *t = NULL;
|
|
|
|
|
|
|
|
while ((t = av_dict_get(m, "", t, AV_DICT_IGNORE_SUFFIX)))
|
|
|
|
if (av_strcasecmp(t->key, "title") && av_strcasecmp(t->key, "stereo_mode"))
|
2013-07-17 13:30:36 +02:00
|
|
|
return 1;
|
2013-07-17 08:10:16 +02:00
|
|
|
|
2013-07-17 13:30:36 +02:00
|
|
|
return 0;
|
2013-07-17 08:10:16 +02:00
|
|
|
}
|
|
|
|
|
2010-10-05 11:40:43 +02:00
|
|
|
static int mkv_write_tags(AVFormatContext *s)
|
|
|
|
{
|
2013-07-19 22:52:16 +02:00
|
|
|
MatroskaMuxContext *mkv = s->priv_data;
|
2010-10-05 11:40:43 +02:00
|
|
|
ebml_master tags = {0};
|
|
|
|
int i, ret;
|
|
|
|
|
2010-10-15 21:04:25 +02:00
|
|
|
ff_metadata_conv_ctx(s, ff_mkv_metadata_conv, NULL);
|
|
|
|
|
2013-07-17 08:10:16 +02:00
|
|
|
if (mkv_check_tag(s->metadata)) {
|
2010-10-05 11:40:43 +02:00
|
|
|
ret = mkv_write_tag(s, s->metadata, 0, 0, &tags);
|
|
|
|
if (ret < 0) return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
for (i = 0; i < s->nb_streams; i++) {
|
|
|
|
AVStream *st = s->streams[i];
|
|
|
|
|
2013-07-17 08:10:16 +02:00
|
|
|
if (!mkv_check_tag(st->metadata))
|
2010-10-05 11:40:43 +02:00
|
|
|
continue;
|
|
|
|
|
|
|
|
ret = mkv_write_tag(s, st->metadata, MATROSKA_ID_TAGTARGETS_TRACKUID, i + 1, &tags);
|
|
|
|
if (ret < 0) return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
for (i = 0; i < s->nb_chapters; i++) {
|
|
|
|
AVChapter *ch = s->chapters[i];
|
|
|
|
|
2013-07-17 08:10:16 +02:00
|
|
|
if (!mkv_check_tag(ch->metadata))
|
2010-10-05 11:40:43 +02:00
|
|
|
continue;
|
|
|
|
|
2013-07-19 22:52:16 +02:00
|
|
|
ret = mkv_write_tag(s, ch->metadata, MATROSKA_ID_TAGTARGETS_CHAPTERUID, ch->id + mkv->chapter_id_offset, &tags);
|
2010-10-05 11:40:43 +02:00
|
|
|
if (ret < 0) return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (tags.pos)
|
|
|
|
end_ebml_master(s->pb, tags);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2011-07-30 13:37:36 +02:00
|
|
|
static int mkv_write_attachments(AVFormatContext *s)
|
|
|
|
{
|
|
|
|
MatroskaMuxContext *mkv = s->priv_data;
|
|
|
|
AVIOContext *pb = s->pb;
|
|
|
|
ebml_master attachments;
|
|
|
|
AVLFG c;
|
|
|
|
int i, ret;
|
|
|
|
|
|
|
|
if (!mkv->have_attachments)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
av_lfg_init(&c, av_get_random_seed());
|
|
|
|
|
|
|
|
ret = mkv_add_seekhead_entry(mkv->main_seekhead, MATROSKA_ID_ATTACHMENTS, avio_tell(pb));
|
|
|
|
if (ret < 0) return ret;
|
|
|
|
|
|
|
|
attachments = start_ebml_master(pb, MATROSKA_ID_ATTACHMENTS, 0);
|
|
|
|
|
|
|
|
for (i = 0; i < s->nb_streams; i++) {
|
|
|
|
AVStream *st = s->streams[i];
|
|
|
|
ebml_master attached_file;
|
|
|
|
AVDictionaryEntry *t;
|
|
|
|
const char *mimetype = NULL;
|
2013-01-01 14:14:43 +01:00
|
|
|
uint64_t fileuid;
|
2011-07-30 13:37:36 +02:00
|
|
|
|
|
|
|
if (st->codec->codec_type != AVMEDIA_TYPE_ATTACHMENT)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
attached_file = start_ebml_master(pb, MATROSKA_ID_ATTACHEDFILE, 0);
|
|
|
|
|
|
|
|
if (t = av_dict_get(st->metadata, "title", NULL, 0))
|
|
|
|
put_ebml_string(pb, MATROSKA_ID_FILEDESC, t->value);
|
|
|
|
if (!(t = av_dict_get(st->metadata, "filename", NULL, 0))) {
|
|
|
|
av_log(s, AV_LOG_ERROR, "Attachment stream %d has no filename tag.\n", i);
|
|
|
|
return AVERROR(EINVAL);
|
|
|
|
}
|
|
|
|
put_ebml_string(pb, MATROSKA_ID_FILENAME, t->value);
|
|
|
|
if (t = av_dict_get(st->metadata, "mimetype", NULL, 0))
|
|
|
|
mimetype = t->value;
|
2012-08-05 11:11:04 +02:00
|
|
|
else if (st->codec->codec_id != AV_CODEC_ID_NONE ) {
|
2011-07-30 13:37:36 +02:00
|
|
|
int i;
|
2012-08-05 11:11:04 +02:00
|
|
|
for (i = 0; ff_mkv_mime_tags[i].id != AV_CODEC_ID_NONE; i++)
|
2011-07-30 13:37:36 +02:00
|
|
|
if (ff_mkv_mime_tags[i].id == st->codec->codec_id) {
|
|
|
|
mimetype = ff_mkv_mime_tags[i].str;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (!mimetype) {
|
|
|
|
av_log(s, AV_LOG_ERROR, "Attachment stream %d has no mimetype tag and "
|
|
|
|
"it cannot be deduced from the codec id.\n", i);
|
|
|
|
return AVERROR(EINVAL);
|
|
|
|
}
|
|
|
|
|
2013-01-01 14:14:43 +01:00
|
|
|
if (st->codec->flags & CODEC_FLAG_BITEXACT) {
|
|
|
|
struct AVSHA *sha = av_sha_alloc();
|
|
|
|
uint8_t digest[20];
|
|
|
|
if (!sha)
|
|
|
|
return AVERROR(ENOMEM);
|
|
|
|
av_sha_init(sha, 160);
|
|
|
|
av_sha_update(sha, st->codec->extradata, st->codec->extradata_size);
|
|
|
|
av_sha_final(sha, digest);
|
|
|
|
av_free(sha);
|
|
|
|
fileuid = AV_RL64(digest);
|
|
|
|
} else {
|
|
|
|
fileuid = av_lfg_get(&c);
|
|
|
|
}
|
|
|
|
av_log(s, AV_LOG_VERBOSE, "Using %.16"PRIx64" for attachment %d\n",
|
|
|
|
fileuid, i);
|
|
|
|
|
2011-07-30 13:37:36 +02:00
|
|
|
put_ebml_string(pb, MATROSKA_ID_FILEMIMETYPE, mimetype);
|
|
|
|
put_ebml_binary(pb, MATROSKA_ID_FILEDATA, st->codec->extradata, st->codec->extradata_size);
|
2013-01-01 14:14:43 +01:00
|
|
|
put_ebml_uint(pb, MATROSKA_ID_FILEUID, fileuid);
|
2011-07-30 13:37:36 +02:00
|
|
|
end_ebml_master(pb, attached_file);
|
|
|
|
}
|
|
|
|
end_ebml_master(pb, attachments);
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2007-09-05 02:23:15 +02:00
|
|
|
static int mkv_write_header(AVFormatContext *s)
|
|
|
|
{
|
|
|
|
MatroskaMuxContext *mkv = s->priv_data;
|
2011-02-20 11:04:12 +01:00
|
|
|
AVIOContext *pb = s->pb;
|
2007-09-05 02:24:56 +02:00
|
|
|
ebml_master ebml_header, segment_info;
|
2011-05-22 12:46:29 +02:00
|
|
|
AVDictionaryEntry *tag;
|
2010-06-05 00:41:03 +02:00
|
|
|
int ret, i;
|
2007-09-05 02:23:15 +02:00
|
|
|
|
2010-06-05 00:40:54 +02:00
|
|
|
if (!strcmp(s->oformat->name, "webm")) mkv->mode = MODE_WEBM;
|
|
|
|
else mkv->mode = MODE_MATROSKAv2;
|
|
|
|
|
2012-10-10 14:32:43 +02:00
|
|
|
if (s->avoid_negative_ts < 0)
|
|
|
|
s->avoid_negative_ts = 1;
|
|
|
|
|
2013-02-10 10:51:12 +01:00
|
|
|
for (i = 0; i < s->nb_streams; i++)
|
|
|
|
if (s->streams[i]->codec->codec_id == AV_CODEC_ID_ATRAC3 ||
|
|
|
|
s->streams[i]->codec->codec_id == AV_CODEC_ID_COOK ||
|
|
|
|
s->streams[i]->codec->codec_id == AV_CODEC_ID_RA_288 ||
|
|
|
|
s->streams[i]->codec->codec_id == AV_CODEC_ID_SIPR ||
|
|
|
|
s->streams[i]->codec->codec_id == AV_CODEC_ID_RV10 ||
|
|
|
|
s->streams[i]->codec->codec_id == AV_CODEC_ID_RV20) {
|
|
|
|
av_log(s, AV_LOG_ERROR,
|
|
|
|
"The Matroska muxer does not yet support muxing %s\n",
|
|
|
|
avcodec_get_name(s->streams[i]->codec->codec_id));
|
|
|
|
return AVERROR_PATCHWELCOME;
|
|
|
|
}
|
|
|
|
|
2010-03-09 05:23:28 +01:00
|
|
|
mkv->tracks = av_mallocz(s->nb_streams * sizeof(*mkv->tracks));
|
2010-06-05 00:41:06 +02:00
|
|
|
if (!mkv->tracks)
|
|
|
|
return AVERROR(ENOMEM);
|
2007-09-05 02:24:29 +02:00
|
|
|
|
2007-09-05 02:24:56 +02:00
|
|
|
ebml_header = start_ebml_master(pb, EBML_ID_HEADER, 0);
|
2007-09-05 02:23:15 +02:00
|
|
|
put_ebml_uint (pb, EBML_ID_EBMLVERSION , 1);
|
|
|
|
put_ebml_uint (pb, EBML_ID_EBMLREADVERSION , 1);
|
|
|
|
put_ebml_uint (pb, EBML_ID_EBMLMAXIDLENGTH , 4);
|
|
|
|
put_ebml_uint (pb, EBML_ID_EBMLMAXSIZELENGTH , 8);
|
2010-06-05 00:40:54 +02:00
|
|
|
put_ebml_string (pb, EBML_ID_DOCTYPE , s->oformat->name);
|
2007-09-05 02:23:15 +02:00
|
|
|
put_ebml_uint (pb, EBML_ID_DOCTYPEVERSION , 2);
|
|
|
|
put_ebml_uint (pb, EBML_ID_DOCTYPEREADVERSION , 2);
|
|
|
|
end_ebml_master(pb, ebml_header);
|
|
|
|
|
2007-09-05 02:24:56 +02:00
|
|
|
mkv->segment = start_ebml_master(pb, MATROSKA_ID_SEGMENT, 0);
|
2011-03-03 20:11:45 +01:00
|
|
|
mkv->segment_offset = avio_tell(pb);
|
2007-09-05 02:23:19 +02:00
|
|
|
|
2007-09-05 02:25:16 +02:00
|
|
|
// we write 2 seek heads - one at the end of the file to point to each
|
|
|
|
// cluster, and one at the beginning to point to all other level one
|
|
|
|
// elements (including the seek head at the end of the file), which
|
|
|
|
// isn't more than 10 elements if we only write one of each other
|
|
|
|
// currently defined level 1 element
|
2007-09-05 02:23:19 +02:00
|
|
|
mkv->main_seekhead = mkv_start_seekhead(pb, mkv->segment_offset, 10);
|
2010-06-05 00:41:11 +02:00
|
|
|
if (!mkv->main_seekhead)
|
2007-09-05 02:25:29 +02:00
|
|
|
return AVERROR(ENOMEM);
|
2007-09-05 02:23:19 +02:00
|
|
|
|
2011-03-03 20:11:45 +01:00
|
|
|
ret = mkv_add_seekhead_entry(mkv->main_seekhead, MATROSKA_ID_INFO, avio_tell(pb));
|
2007-09-05 02:25:32 +02:00
|
|
|
if (ret < 0) return ret;
|
2007-09-05 02:23:15 +02:00
|
|
|
|
2007-09-05 02:24:56 +02:00
|
|
|
segment_info = start_ebml_master(pb, MATROSKA_ID_INFO, 0);
|
2007-09-05 02:23:15 +02:00
|
|
|
put_ebml_uint(pb, MATROSKA_ID_TIMECODESCALE, 1000000);
|
2011-05-22 12:46:29 +02:00
|
|
|
if ((tag = av_dict_get(s->metadata, "title", NULL, 0)))
|
2009-02-15 17:53:05 +01:00
|
|
|
put_ebml_string(pb, MATROSKA_ID_TITLE, tag->value);
|
2007-09-05 02:23:15 +02:00
|
|
|
if (!(s->streams[0]->codec->flags & CODEC_FLAG_BITEXACT)) {
|
2010-06-05 00:41:03 +02:00
|
|
|
uint32_t segment_uid[4];
|
2010-06-08 12:44:27 +02:00
|
|
|
AVLFG lfg;
|
|
|
|
|
|
|
|
av_lfg_init(&lfg, av_get_random_seed());
|
|
|
|
|
2010-06-05 00:41:03 +02:00
|
|
|
for (i = 0; i < 4; i++)
|
2010-06-08 12:44:27 +02:00
|
|
|
segment_uid[i] = av_lfg_get(&lfg);
|
2010-06-05 00:41:03 +02:00
|
|
|
|
2007-09-05 02:23:59 +02:00
|
|
|
put_ebml_string(pb, MATROSKA_ID_MUXINGAPP , LIBAVFORMAT_IDENT);
|
2007-09-05 02:23:15 +02:00
|
|
|
put_ebml_string(pb, MATROSKA_ID_WRITINGAPP, LIBAVFORMAT_IDENT);
|
2010-06-05 00:41:03 +02:00
|
|
|
put_ebml_binary(pb, MATROSKA_ID_SEGMENTUID, segment_uid, 16);
|
2007-09-05 02:23:15 +02:00
|
|
|
}
|
2007-09-05 02:24:03 +02:00
|
|
|
|
2012-03-05 19:02:48 +01:00
|
|
|
if (tag = av_dict_get(s->metadata, "creation_time", NULL, 0)) {
|
|
|
|
// Adjust time so it's relative to 2001-01-01 and convert to nanoseconds.
|
|
|
|
int64_t date_utc = (ff_iso8601_to_unix_time(tag->value) - 978307200) * 1000000000;
|
|
|
|
uint8_t date_utc_buf[8];
|
|
|
|
AV_WB64(date_utc_buf, date_utc);
|
|
|
|
put_ebml_binary(pb, MATROSKA_ID_DATEUTC, date_utc_buf, 8);
|
|
|
|
}
|
|
|
|
|
2007-09-05 02:23:15 +02:00
|
|
|
// reserve space for the duration
|
|
|
|
mkv->duration = 0;
|
2011-03-03 20:11:45 +01:00
|
|
|
mkv->duration_offset = avio_tell(pb);
|
2007-09-05 02:23:15 +02:00
|
|
|
put_ebml_void(pb, 11); // assumes double-precision float to be written
|
|
|
|
end_ebml_master(pb, segment_info);
|
|
|
|
|
2007-09-05 02:25:32 +02:00
|
|
|
ret = mkv_write_tracks(s);
|
|
|
|
if (ret < 0) return ret;
|
2007-09-05 02:22:37 +02:00
|
|
|
|
2013-07-19 22:52:16 +02:00
|
|
|
for (i = 0; i < s->nb_chapters; i++)
|
|
|
|
mkv->chapter_id_offset = FFMAX(mkv->chapter_id_offset, 1LL - s->chapters[i]->id);
|
|
|
|
|
2010-06-05 00:40:54 +02:00
|
|
|
if (mkv->mode != MODE_WEBM) {
|
|
|
|
ret = mkv_write_chapters(s);
|
|
|
|
if (ret < 0) return ret;
|
2010-10-05 11:40:43 +02:00
|
|
|
|
|
|
|
ret = mkv_write_tags(s);
|
|
|
|
if (ret < 0) return ret;
|
2011-07-30 13:37:36 +02:00
|
|
|
|
|
|
|
ret = mkv_write_attachments(s);
|
|
|
|
if (ret < 0) return ret;
|
2010-06-05 00:40:54 +02:00
|
|
|
}
|
2009-10-18 14:17:01 +02:00
|
|
|
|
2011-03-05 21:06:46 +01:00
|
|
|
if (!s->pb->seekable)
|
2010-03-04 09:53:04 +01:00
|
|
|
mkv_write_seekhead(pb, mkv->main_seekhead);
|
|
|
|
|
2007-09-05 02:23:27 +02:00
|
|
|
mkv->cues = mkv_start_cues(mkv->segment_offset);
|
|
|
|
if (mkv->cues == NULL)
|
2007-09-05 02:25:27 +02:00
|
|
|
return AVERROR(ENOMEM);
|
2007-09-05 02:23:27 +02:00
|
|
|
|
2013-04-30 08:36:20 +02:00
|
|
|
if (pb->seekable && mkv->reserve_cues_space) {
|
|
|
|
mkv->cues_pos = avio_tell(pb);
|
|
|
|
put_ebml_void(pb, mkv->reserve_cues_space);
|
|
|
|
}
|
|
|
|
|
2010-06-05 00:40:50 +02:00
|
|
|
av_init_packet(&mkv->cur_audio_pkt);
|
|
|
|
mkv->cur_audio_pkt.size = 0;
|
2012-03-14 21:40:29 +01:00
|
|
|
mkv->cluster_pos = -1;
|
2010-06-05 00:40:50 +02:00
|
|
|
|
2011-03-14 20:39:06 +01:00
|
|
|
avio_flush(pb);
|
2007-09-05 02:22:37 +02:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2008-10-05 00:44:50 +02:00
|
|
|
static int mkv_blockgroup_size(int pkt_size)
|
2007-09-05 02:24:56 +02:00
|
|
|
{
|
2008-10-05 00:44:50 +02:00
|
|
|
int size = pkt_size + 4;
|
2007-09-05 02:26:07 +02:00
|
|
|
size += ebml_num_size(size);
|
2007-09-05 02:24:56 +02:00
|
|
|
size += 2; // EBML ID for block and block duration
|
|
|
|
size += 8; // max size of block duration
|
2007-09-05 02:26:07 +02:00
|
|
|
size += ebml_num_size(size);
|
2007-09-05 02:24:56 +02:00
|
|
|
size += 1; // blockgroup EBML ID
|
|
|
|
return size;
|
|
|
|
}
|
|
|
|
|
2008-10-05 00:57:56 +02:00
|
|
|
static int ass_get_duration(const uint8_t *p)
|
|
|
|
{
|
|
|
|
int sh, sm, ss, sc, eh, em, es, ec;
|
|
|
|
uint64_t start, end;
|
|
|
|
|
|
|
|
if (sscanf(p, "%*[^,],%d:%d:%d%*c%d,%d:%d:%d%*c%d",
|
|
|
|
&sh, &sm, &ss, &sc, &eh, &em, &es, &ec) != 8)
|
|
|
|
return 0;
|
2012-10-20 18:47:44 +02:00
|
|
|
start = 3600000LL*sh + 60000LL*sm + 1000LL*ss + 10LL*sc;
|
|
|
|
end = 3600000LL*eh + 60000LL*em + 1000LL*es + 10LL*ec;
|
2008-10-05 00:57:56 +02:00
|
|
|
return end - start;
|
|
|
|
}
|
|
|
|
|
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 03:06:43 +01:00
|
|
|
#if FF_API_ASS_SSA
|
2011-02-20 11:04:12 +01:00
|
|
|
static int mkv_write_ass_blocks(AVFormatContext *s, AVIOContext *pb, AVPacket *pkt)
|
2008-10-05 00:57:56 +02:00
|
|
|
{
|
|
|
|
MatroskaMuxContext *mkv = s->priv_data;
|
|
|
|
int i, layer = 0, max_duration = 0, size, line_size, data_size = pkt->size;
|
|
|
|
uint8_t *start, *end, *data = pkt->data;
|
|
|
|
ebml_master blockgroup;
|
|
|
|
char buffer[2048];
|
|
|
|
|
|
|
|
while (data_size) {
|
|
|
|
int duration = ass_get_duration(data);
|
|
|
|
max_duration = FFMAX(duration, max_duration);
|
|
|
|
end = memchr(data, '\n', data_size);
|
|
|
|
size = line_size = end ? end-data+1 : data_size;
|
|
|
|
size -= end ? (end[-1]=='\r')+1 : 0;
|
|
|
|
start = data;
|
|
|
|
for (i=0; i<3; i++, start++)
|
|
|
|
if (!(start = memchr(start, ',', size-(start-data))))
|
|
|
|
return max_duration;
|
|
|
|
size -= start - data;
|
|
|
|
sscanf(data, "Dialogue: %d,", &layer);
|
|
|
|
i = snprintf(buffer, sizeof(buffer), "%"PRId64",%d,",
|
2011-03-16 08:45:14 +01:00
|
|
|
s->streams[pkt->stream_index]->nb_frames, layer);
|
2008-10-05 00:57:56 +02:00
|
|
|
size = FFMIN(i+size, sizeof(buffer));
|
|
|
|
memcpy(buffer+i, start, size-i);
|
|
|
|
|
|
|
|
av_log(s, AV_LOG_DEBUG, "Writing block at offset %" PRIu64 ", size %d, "
|
|
|
|
"pts %" PRId64 ", duration %d\n",
|
2011-03-03 20:11:45 +01:00
|
|
|
avio_tell(pb), size, pkt->pts, duration);
|
2008-10-05 00:57:56 +02:00
|
|
|
blockgroup = start_ebml_master(pb, MATROSKA_ID_BLOCKGROUP, mkv_blockgroup_size(size));
|
|
|
|
put_ebml_id(pb, MATROSKA_ID_BLOCK);
|
|
|
|
put_ebml_num(pb, size+4, 0);
|
2011-02-21 19:28:17 +01:00
|
|
|
avio_w8(pb, 0x80 | (pkt->stream_index + 1)); // this assumes stream_index is less than 126
|
|
|
|
avio_wb16(pb, pkt->pts - mkv->cluster_pts);
|
|
|
|
avio_w8(pb, 0);
|
|
|
|
avio_write(pb, buffer, size);
|
2008-10-05 00:57:56 +02:00
|
|
|
put_ebml_uint(pb, MATROSKA_ID_BLOCKDURATION, duration);
|
|
|
|
end_ebml_master(pb, blockgroup);
|
|
|
|
|
|
|
|
data += line_size;
|
|
|
|
data_size -= line_size;
|
|
|
|
}
|
|
|
|
|
|
|
|
return max_duration;
|
|
|
|
}
|
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 03:06:43 +01:00
|
|
|
#endif
|
2008-10-05 00:57:56 +02:00
|
|
|
|
2013-05-28 10:09:21 +02:00
|
|
|
static int mkv_strip_wavpack(const uint8_t *src, uint8_t **pdst, int *size)
|
|
|
|
{
|
|
|
|
uint8_t *dst;
|
|
|
|
int srclen = *size;
|
|
|
|
int offset = 0;
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
dst = av_malloc(srclen);
|
|
|
|
if (!dst)
|
|
|
|
return AVERROR(ENOMEM);
|
|
|
|
|
|
|
|
while (srclen >= WV_HEADER_SIZE) {
|
|
|
|
WvHeader header;
|
|
|
|
|
|
|
|
ret = ff_wv_parse_header(&header, src);
|
|
|
|
if (ret < 0)
|
|
|
|
goto fail;
|
|
|
|
src += WV_HEADER_SIZE;
|
|
|
|
srclen -= WV_HEADER_SIZE;
|
|
|
|
|
|
|
|
if (srclen < header.blocksize) {
|
|
|
|
ret = AVERROR_INVALIDDATA;
|
|
|
|
goto fail;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (header.initial) {
|
|
|
|
AV_WL32(dst + offset, header.samples);
|
|
|
|
offset += 4;
|
|
|
|
}
|
|
|
|
AV_WL32(dst + offset, header.flags);
|
|
|
|
AV_WL32(dst + offset + 4, header.crc);
|
|
|
|
offset += 8;
|
|
|
|
|
|
|
|
if (!(header.initial && header.final)) {
|
|
|
|
AV_WL32(dst + offset, header.blocksize);
|
|
|
|
offset += 4;
|
|
|
|
}
|
|
|
|
|
|
|
|
memcpy(dst + offset, src, header.blocksize);
|
|
|
|
src += header.blocksize;
|
|
|
|
srclen -= header.blocksize;
|
|
|
|
offset += header.blocksize;
|
|
|
|
}
|
|
|
|
|
|
|
|
*pdst = dst;
|
|
|
|
*size = offset;
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
fail:
|
|
|
|
av_freep(&dst);
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2011-02-20 11:04:12 +01:00
|
|
|
static void mkv_write_block(AVFormatContext *s, AVIOContext *pb,
|
2010-03-04 09:53:14 +01:00
|
|
|
unsigned int blockid, AVPacket *pkt, int flags)
|
2007-09-05 02:23:47 +02:00
|
|
|
{
|
|
|
|
MatroskaMuxContext *mkv = s->priv_data;
|
2009-01-15 15:03:07 +01:00
|
|
|
AVCodecContext *codec = s->streams[pkt->stream_index]->codec;
|
2013-05-09 01:59:32 +02:00
|
|
|
uint8_t *data = NULL, *side_data = NULL;
|
|
|
|
int offset = 0, size = pkt->size, side_data_size = 0;
|
2010-03-09 05:23:28 +01:00
|
|
|
int64_t ts = mkv->tracks[pkt->stream_index].write_dts ? pkt->dts : pkt->pts;
|
2013-05-09 01:59:32 +02:00
|
|
|
uint64_t additional_id = 0;
|
2013-05-17 13:58:07 +02:00
|
|
|
ebml_master block_group, block_additions, block_more;
|
2007-09-05 02:23:47 +02:00
|
|
|
|
2007-09-05 02:25:38 +02:00
|
|
|
av_log(s, AV_LOG_DEBUG, "Writing block at offset %" PRIu64 ", size %d, "
|
|
|
|
"pts %" PRId64 ", dts %" PRId64 ", duration %d, flags %d\n",
|
2011-03-03 20:11:45 +01:00
|
|
|
avio_tell(pb), pkt->size, pkt->pts, pkt->dts, pkt->duration, flags);
|
2012-08-05 11:11:04 +02:00
|
|
|
if (codec->codec_id == AV_CODEC_ID_H264 && codec->extradata_size > 0 &&
|
2009-01-20 01:52:12 +01:00
|
|
|
(AV_RB24(codec->extradata) == 1 || AV_RB32(codec->extradata) == 1))
|
|
|
|
ff_avc_parse_nal_units_buf(pkt->data, &data, &size);
|
2013-05-28 10:09:21 +02:00
|
|
|
else if (codec->codec_id == AV_CODEC_ID_WAVPACK) {
|
|
|
|
int ret = mkv_strip_wavpack(pkt->data, &data, &size);
|
|
|
|
if (ret < 0) {
|
|
|
|
av_log(s, AV_LOG_ERROR, "Error stripping a WavPack packet.\n");
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
} else
|
2009-01-20 01:52:12 +01:00
|
|
|
data = pkt->data;
|
2012-09-15 00:59:05 +02:00
|
|
|
|
|
|
|
if (codec->codec_id == AV_CODEC_ID_PRORES) {
|
|
|
|
/* Matroska specification requires to remove the first QuickTime atom
|
|
|
|
*/
|
|
|
|
size -= 8;
|
|
|
|
offset = 8;
|
|
|
|
}
|
|
|
|
|
2013-05-09 01:59:32 +02:00
|
|
|
side_data = av_packet_get_side_data(pkt,
|
|
|
|
AV_PKT_DATA_MATROSKA_BLOCKADDITIONAL,
|
|
|
|
&side_data_size);
|
|
|
|
if (side_data) {
|
|
|
|
additional_id = AV_RB64(side_data);
|
|
|
|
side_data += 8;
|
|
|
|
side_data_size -= 8;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (side_data_size && additional_id == 1) {
|
|
|
|
block_group = start_ebml_master(pb, MATROSKA_ID_BLOCKGROUP, 0);
|
2013-05-17 13:58:07 +02:00
|
|
|
blockid = MATROSKA_ID_BLOCK;
|
|
|
|
}
|
|
|
|
|
|
|
|
put_ebml_id(pb, blockid);
|
|
|
|
put_ebml_num(pb, size+4, 0);
|
|
|
|
avio_w8(pb, 0x80 | (pkt->stream_index + 1)); // this assumes stream_index is less than 126
|
|
|
|
avio_wb16(pb, ts - mkv->cluster_pts);
|
|
|
|
avio_w8(pb, flags);
|
|
|
|
avio_write(pb, data + offset, size);
|
|
|
|
if (data != pkt->data)
|
|
|
|
av_free(data);
|
|
|
|
|
|
|
|
if (side_data_size && additional_id == 1) {
|
2013-05-09 01:59:32 +02:00
|
|
|
block_additions = start_ebml_master(pb, MATROSKA_ID_BLOCKADDITIONS, 0);
|
|
|
|
block_more = start_ebml_master(pb, MATROSKA_ID_BLOCKMORE, 0);
|
|
|
|
put_ebml_uint(pb, MATROSKA_ID_BLOCKADDID, 1);
|
|
|
|
put_ebml_id(pb, MATROSKA_ID_BLOCKADDITIONAL);
|
|
|
|
put_ebml_num(pb, side_data_size, 0);
|
|
|
|
avio_write(pb, side_data, side_data_size);
|
|
|
|
end_ebml_master(pb, block_more);
|
|
|
|
end_ebml_master(pb, block_additions);
|
|
|
|
end_ebml_master(pb, block_group);
|
|
|
|
}
|
2007-09-05 02:23:47 +02:00
|
|
|
}
|
|
|
|
|
2010-07-25 23:16:58 +02:00
|
|
|
static int srt_get_duration(uint8_t **buf)
|
|
|
|
{
|
|
|
|
int i, duration = 0;
|
|
|
|
|
|
|
|
for (i=0; i<2 && !duration; i++) {
|
|
|
|
int s_hour, s_min, s_sec, s_hsec, e_hour, e_min, e_sec, e_hsec;
|
|
|
|
if (sscanf(*buf, "%d:%2d:%2d%*1[,.]%3d --> %d:%2d:%2d%*1[,.]%3d",
|
|
|
|
&s_hour, &s_min, &s_sec, &s_hsec,
|
|
|
|
&e_hour, &e_min, &e_sec, &e_hsec) == 8) {
|
|
|
|
s_min += 60*s_hour; e_min += 60*e_hour;
|
|
|
|
s_sec += 60*s_min; e_sec += 60*e_min;
|
|
|
|
s_hsec += 1000*s_sec; e_hsec += 1000*e_sec;
|
|
|
|
duration = e_hsec - s_hsec;
|
|
|
|
}
|
|
|
|
*buf += strcspn(*buf, "\n") + 1;
|
|
|
|
}
|
|
|
|
return duration;
|
|
|
|
}
|
|
|
|
|
2011-02-20 11:04:12 +01:00
|
|
|
static int mkv_write_srt_blocks(AVFormatContext *s, AVIOContext *pb, AVPacket *pkt)
|
2010-07-25 23:16:58 +02:00
|
|
|
{
|
|
|
|
ebml_master blockgroup;
|
|
|
|
AVPacket pkt2 = *pkt;
|
|
|
|
int64_t duration = srt_get_duration(&pkt2.data);
|
|
|
|
pkt2.size -= pkt2.data - pkt->data;
|
|
|
|
|
|
|
|
blockgroup = start_ebml_master(pb, MATROSKA_ID_BLOCKGROUP,
|
|
|
|
mkv_blockgroup_size(pkt2.size));
|
|
|
|
mkv_write_block(s, pb, MATROSKA_ID_BLOCK, &pkt2, 0);
|
|
|
|
put_ebml_uint(pb, MATROSKA_ID_BLOCKDURATION, duration);
|
|
|
|
end_ebml_master(pb, blockgroup);
|
|
|
|
|
|
|
|
return duration;
|
|
|
|
}
|
|
|
|
|
2013-07-09 01:25:30 +02:00
|
|
|
static int mkv_write_vtt_blocks(AVFormatContext *s, AVIOContext *pb, AVPacket *pkt)
|
|
|
|
{
|
|
|
|
MatroskaMuxContext *mkv = s->priv_data;
|
|
|
|
ebml_master blockgroup;
|
|
|
|
int id_size, settings_size, size;
|
|
|
|
uint8_t *id, *settings;
|
|
|
|
int64_t ts = mkv->tracks[pkt->stream_index].write_dts ? pkt->dts : pkt->pts;
|
|
|
|
const int flags = 0;
|
|
|
|
|
|
|
|
id_size = 0;
|
|
|
|
id = av_packet_get_side_data(pkt, AV_PKT_DATA_WEBVTT_IDENTIFIER,
|
|
|
|
&id_size);
|
|
|
|
|
|
|
|
settings_size = 0;
|
|
|
|
settings = av_packet_get_side_data(pkt, AV_PKT_DATA_WEBVTT_SETTINGS,
|
|
|
|
&settings_size);
|
|
|
|
|
|
|
|
size = id_size + 1 + settings_size + 1 + pkt->size;
|
|
|
|
|
|
|
|
av_log(s, AV_LOG_DEBUG, "Writing block at offset %" PRIu64 ", size %d, "
|
|
|
|
"pts %" PRId64 ", dts %" PRId64 ", duration %d, flags %d\n",
|
|
|
|
avio_tell(pb), size, pkt->pts, pkt->dts, pkt->duration, flags);
|
|
|
|
|
|
|
|
blockgroup = start_ebml_master(pb, MATROSKA_ID_BLOCKGROUP, mkv_blockgroup_size(size));
|
|
|
|
|
|
|
|
put_ebml_id(pb, MATROSKA_ID_BLOCK);
|
|
|
|
put_ebml_num(pb, size+4, 0);
|
|
|
|
avio_w8(pb, 0x80 | (pkt->stream_index + 1)); // this assumes stream_index is less than 126
|
|
|
|
avio_wb16(pb, ts - mkv->cluster_pts);
|
|
|
|
avio_w8(pb, flags);
|
|
|
|
avio_printf(pb, "%.*s\n%.*s\n%.*s", id_size, id, settings_size, settings, pkt->size, pkt->data);
|
|
|
|
|
|
|
|
put_ebml_uint(pb, MATROSKA_ID_BLOCKDURATION, pkt->duration);
|
|
|
|
end_ebml_master(pb, blockgroup);
|
|
|
|
|
|
|
|
return pkt->duration;
|
|
|
|
}
|
|
|
|
|
2010-03-04 09:53:14 +01:00
|
|
|
static void mkv_flush_dynbuf(AVFormatContext *s)
|
|
|
|
{
|
|
|
|
MatroskaMuxContext *mkv = s->priv_data;
|
|
|
|
int bufsize;
|
|
|
|
uint8_t *dyn_buf;
|
|
|
|
|
|
|
|
if (!mkv->dyn_bc)
|
|
|
|
return;
|
|
|
|
|
2011-03-17 08:16:07 +01:00
|
|
|
bufsize = avio_close_dyn_buf(mkv->dyn_bc, &dyn_buf);
|
2011-02-21 19:28:17 +01:00
|
|
|
avio_write(s->pb, dyn_buf, bufsize);
|
2010-03-04 09:53:14 +01:00
|
|
|
av_free(dyn_buf);
|
|
|
|
mkv->dyn_bc = NULL;
|
|
|
|
}
|
|
|
|
|
2010-06-05 00:40:50 +02:00
|
|
|
static int mkv_write_packet_internal(AVFormatContext *s, AVPacket *pkt)
|
2007-09-05 02:22:37 +02:00
|
|
|
{
|
2007-09-05 02:23:00 +02:00
|
|
|
MatroskaMuxContext *mkv = s->priv_data;
|
2011-02-20 11:04:12 +01:00
|
|
|
AVIOContext *pb = s->pb;
|
2007-09-05 02:23:53 +02:00
|
|
|
AVCodecContext *codec = s->streams[pkt->stream_index]->codec;
|
2010-03-31 14:29:58 +02:00
|
|
|
int keyframe = !!(pkt->flags & AV_PKT_FLAG_KEY);
|
2008-09-05 01:08:19 +02:00
|
|
|
int duration = pkt->duration;
|
2007-09-05 02:25:32 +02:00
|
|
|
int ret;
|
2010-03-09 05:23:28 +01:00
|
|
|
int64_t ts = mkv->tracks[pkt->stream_index].write_dts ? pkt->dts : pkt->pts;
|
2013-07-23 09:52:08 +02:00
|
|
|
int64_t relative_packet_pos;
|
2007-09-05 02:22:52 +02:00
|
|
|
|
2010-03-09 05:23:33 +01:00
|
|
|
if (ts == AV_NOPTS_VALUE) {
|
|
|
|
av_log(s, AV_LOG_ERROR, "Can't write packet with unknown timestamp\n");
|
|
|
|
return AVERROR(EINVAL);
|
|
|
|
}
|
|
|
|
|
2011-03-05 21:06:46 +01:00
|
|
|
if (!s->pb->seekable) {
|
2012-10-20 18:38:36 +02:00
|
|
|
if (!mkv->dyn_bc) {
|
|
|
|
if ((ret = avio_open_dyn_buf(&mkv->dyn_bc)) < 0) {
|
|
|
|
av_log(s, AV_LOG_ERROR, "Failed to open dynamic buffer\n");
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
}
|
2010-03-04 09:53:14 +01:00
|
|
|
pb = mkv->dyn_bc;
|
|
|
|
}
|
|
|
|
|
2012-03-14 21:40:29 +01:00
|
|
|
if (mkv->cluster_pos == -1) {
|
2011-03-03 20:11:45 +01:00
|
|
|
mkv->cluster_pos = avio_tell(s->pb);
|
2007-09-05 02:24:56 +02:00
|
|
|
mkv->cluster = start_ebml_master(pb, MATROSKA_ID_CLUSTER, 0);
|
2010-03-09 05:23:36 +01:00
|
|
|
put_ebml_uint(pb, MATROSKA_ID_CLUSTERTIMECODE, FFMAX(0, ts));
|
|
|
|
mkv->cluster_pts = FFMAX(0, ts);
|
2007-09-05 02:23:00 +02:00
|
|
|
}
|
|
|
|
|
2013-07-23 09:52:08 +02:00
|
|
|
relative_packet_pos = avio_tell(s->pb) - mkv->cluster.pos;
|
|
|
|
|
2010-03-31 01:30:55 +02:00
|
|
|
if (codec->codec_type != AVMEDIA_TYPE_SUBTITLE) {
|
2010-03-04 09:53:14 +01:00
|
|
|
mkv_write_block(s, pb, MATROSKA_ID_SIMPLEBLOCK, pkt, keyframe << 7);
|
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 03:06:43 +01:00
|
|
|
#if FF_API_ASS_SSA
|
2012-08-05 11:11:04 +02:00
|
|
|
} else if (codec->codec_id == AV_CODEC_ID_SSA) {
|
2010-03-04 09:53:14 +01:00
|
|
|
duration = mkv_write_ass_blocks(s, pb, 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 03:06:43 +01:00
|
|
|
#endif
|
2012-08-05 11:11:04 +02:00
|
|
|
} else if (codec->codec_id == AV_CODEC_ID_SRT) {
|
2010-07-25 23:16:58 +02:00
|
|
|
duration = mkv_write_srt_blocks(s, pb, pkt);
|
2013-07-09 01:25:30 +02:00
|
|
|
} else if (codec->codec_id == AV_CODEC_ID_WEBVTT) {
|
|
|
|
duration = mkv_write_vtt_blocks(s, pb, pkt);
|
2007-09-05 02:23:49 +02:00
|
|
|
} else {
|
2008-10-05 00:44:50 +02:00
|
|
|
ebml_master blockgroup = start_ebml_master(pb, MATROSKA_ID_BLOCKGROUP, mkv_blockgroup_size(pkt->size));
|
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 06:50:02 +02:00
|
|
|
/* For backward compatibility, prefer convergence_duration. */
|
|
|
|
if (pkt->convergence_duration > 0) {
|
|
|
|
duration = pkt->convergence_duration;
|
|
|
|
}
|
2010-03-04 09:53:14 +01:00
|
|
|
mkv_write_block(s, pb, MATROSKA_ID_BLOCK, pkt, 0);
|
2008-10-05 00:47:10 +02:00
|
|
|
put_ebml_uint(pb, MATROSKA_ID_BLOCKDURATION, duration);
|
2007-09-05 02:23:49 +02:00
|
|
|
end_ebml_master(pb, blockgroup);
|
|
|
|
}
|
2007-09-05 02:23:11 +02:00
|
|
|
|
2010-03-31 01:30:55 +02:00
|
|
|
if (codec->codec_type == AVMEDIA_TYPE_VIDEO && keyframe) {
|
2013-07-23 09:52:08 +02:00
|
|
|
ret = mkv_add_cuepoint(mkv->cues, pkt->stream_index, ts, mkv->cluster_pos, relative_packet_pos);
|
2007-09-05 02:25:32 +02:00
|
|
|
if (ret < 0) return ret;
|
2007-09-05 02:23:27 +02:00
|
|
|
}
|
|
|
|
|
2010-06-05 00:40:50 +02:00
|
|
|
mkv->duration = FFMAX(mkv->duration, ts + duration);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int mkv_write_packet(AVFormatContext *s, AVPacket *pkt)
|
|
|
|
{
|
|
|
|
MatroskaMuxContext *mkv = s->priv_data;
|
2011-03-05 21:06:46 +01:00
|
|
|
AVIOContext *pb = s->pb->seekable ? s->pb : mkv->dyn_bc;
|
2010-06-05 00:40:50 +02:00
|
|
|
AVCodecContext *codec = s->streams[pkt->stream_index]->codec;
|
|
|
|
int ret, keyframe = !!(pkt->flags & AV_PKT_FLAG_KEY);
|
|
|
|
int64_t ts = mkv->tracks[pkt->stream_index].write_dts ? pkt->dts : pkt->pts;
|
2011-03-05 21:06:46 +01:00
|
|
|
int cluster_size = avio_tell(pb) - (s->pb->seekable ? mkv->cluster_pos : 0);
|
2010-06-05 00:40:50 +02:00
|
|
|
|
|
|
|
// start a new cluster every 5 MB or 5 sec, or 32k / 1 sec for streaming or
|
|
|
|
// after 4k and on a keyframe
|
2012-03-14 21:40:29 +01:00
|
|
|
if (mkv->cluster_pos != -1 &&
|
2011-03-05 21:06:46 +01:00
|
|
|
((!s->pb->seekable && (cluster_size > 32*1024 || ts > mkv->cluster_pts + 1000))
|
2010-06-05 00:40:50 +02:00
|
|
|
|| cluster_size > 5*1024*1024 || ts > mkv->cluster_pts + 5000
|
|
|
|
|| (codec->codec_type == AVMEDIA_TYPE_VIDEO && keyframe && cluster_size > 4*1024))) {
|
2010-03-04 09:53:08 +01:00
|
|
|
av_log(s, AV_LOG_DEBUG, "Starting new cluster at offset %" PRIu64
|
2011-03-03 20:11:45 +01:00
|
|
|
" bytes, pts %" PRIu64 "\n", avio_tell(pb), ts);
|
2010-03-04 09:53:08 +01:00
|
|
|
end_ebml_master(pb, mkv->cluster);
|
2012-03-14 21:40:29 +01:00
|
|
|
mkv->cluster_pos = -1;
|
2010-03-04 09:53:14 +01:00
|
|
|
if (mkv->dyn_bc)
|
|
|
|
mkv_flush_dynbuf(s);
|
2010-03-04 09:53:08 +01:00
|
|
|
}
|
|
|
|
|
2010-06-05 00:40:50 +02:00
|
|
|
// check if we have an audio packet cached
|
|
|
|
if (mkv->cur_audio_pkt.size > 0) {
|
|
|
|
ret = mkv_write_packet_internal(s, &mkv->cur_audio_pkt);
|
2012-10-31 08:53:18 +01:00
|
|
|
av_free_packet(&mkv->cur_audio_pkt);
|
2010-06-05 00:40:50 +02:00
|
|
|
if (ret < 0) {
|
|
|
|
av_log(s, AV_LOG_ERROR, "Could not write cached audio packet ret:%d\n", ret);
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// buffer an audio packet to ensure the packet containing the video
|
|
|
|
// keyframe's timecode is contained in the same cluster for WebM
|
2012-10-31 08:53:18 +01:00
|
|
|
if (codec->codec_type == AVMEDIA_TYPE_AUDIO) {
|
|
|
|
mkv->cur_audio_pkt = *pkt;
|
2013-06-23 23:00:33 +02:00
|
|
|
if (pkt->buf) {
|
|
|
|
mkv->cur_audio_pkt.buf = av_buffer_ref(pkt->buf);
|
|
|
|
ret = mkv->cur_audio_pkt.buf ? 0 : AVERROR(ENOMEM);
|
|
|
|
} else
|
|
|
|
ret = av_dup_packet(&mkv->cur_audio_pkt);
|
2012-10-31 08:53:18 +01:00
|
|
|
} else
|
2010-06-05 00:40:50 +02:00
|
|
|
ret = mkv_write_packet_internal(s, pkt);
|
|
|
|
return ret;
|
2007-09-05 02:22:37 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
static int mkv_write_trailer(AVFormatContext *s)
|
|
|
|
{
|
|
|
|
MatroskaMuxContext *mkv = s->priv_data;
|
2011-02-20 11:04:12 +01:00
|
|
|
AVIOContext *pb = s->pb;
|
2010-06-05 00:41:11 +02:00
|
|
|
int64_t currentpos, cuespos;
|
2007-09-05 02:25:34 +02:00
|
|
|
int ret;
|
2007-09-05 02:23:11 +02:00
|
|
|
|
2010-06-05 00:40:50 +02:00
|
|
|
// check if we have an audio packet cached
|
|
|
|
if (mkv->cur_audio_pkt.size > 0) {
|
|
|
|
ret = mkv_write_packet_internal(s, &mkv->cur_audio_pkt);
|
2012-10-31 08:53:18 +01:00
|
|
|
av_free_packet(&mkv->cur_audio_pkt);
|
2010-06-05 00:40:50 +02:00
|
|
|
if (ret < 0) {
|
|
|
|
av_log(s, AV_LOG_ERROR, "Could not write cached audio packet ret:%d\n", ret);
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2010-03-04 09:53:14 +01:00
|
|
|
if (mkv->dyn_bc) {
|
|
|
|
end_ebml_master(mkv->dyn_bc, mkv->cluster);
|
|
|
|
mkv_flush_dynbuf(s);
|
2012-03-14 21:40:29 +01:00
|
|
|
} else if (mkv->cluster_pos != -1) {
|
2010-03-04 09:53:14 +01:00
|
|
|
end_ebml_master(pb, mkv->cluster);
|
|
|
|
}
|
2007-09-05 02:23:11 +02:00
|
|
|
|
2011-03-05 21:06:46 +01:00
|
|
|
if (pb->seekable) {
|
2011-04-04 22:29:21 +02:00
|
|
|
if (mkv->cues->num_entries) {
|
2013-04-30 08:36:20 +02:00
|
|
|
if (mkv->reserve_cues_space) {
|
|
|
|
int64_t cues_end;
|
|
|
|
|
|
|
|
currentpos = avio_tell(pb);
|
|
|
|
avio_seek(pb, mkv->cues_pos, SEEK_SET);
|
|
|
|
|
2013-05-03 13:16:34 +02:00
|
|
|
cuespos = mkv_write_cues(pb, mkv->cues, mkv->tracks, s->nb_streams);
|
2013-04-30 08:36:20 +02:00
|
|
|
cues_end = avio_tell(pb);
|
|
|
|
if (cues_end > cuespos + mkv->reserve_cues_space) {
|
|
|
|
av_log(s, AV_LOG_ERROR, "Insufficient space reserved for cues: %d "
|
|
|
|
"(needed: %"PRId64").\n", mkv->reserve_cues_space,
|
|
|
|
cues_end - cuespos);
|
|
|
|
return AVERROR(EINVAL);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (cues_end < cuespos + mkv->reserve_cues_space)
|
|
|
|
put_ebml_void(pb, mkv->reserve_cues_space - (cues_end - cuespos));
|
|
|
|
|
|
|
|
avio_seek(pb, currentpos, SEEK_SET);
|
|
|
|
} else {
|
2013-05-03 13:16:34 +02:00
|
|
|
cuespos = mkv_write_cues(pb, mkv->cues, mkv->tracks, s->nb_streams);
|
2013-04-30 08:36:20 +02:00
|
|
|
}
|
2011-04-04 22:29:21 +02:00
|
|
|
|
|
|
|
ret = mkv_add_seekhead_entry(mkv->main_seekhead, MATROSKA_ID_CUES, cuespos);
|
|
|
|
if (ret < 0) return ret;
|
|
|
|
}
|
2007-09-05 02:23:27 +02:00
|
|
|
|
2007-09-05 02:26:03 +02:00
|
|
|
mkv_write_seekhead(pb, mkv->main_seekhead);
|
|
|
|
|
|
|
|
// update the duration
|
|
|
|
av_log(s, AV_LOG_DEBUG, "end duration = %" PRIu64 "\n", mkv->duration);
|
2011-03-03 20:11:45 +01:00
|
|
|
currentpos = avio_tell(pb);
|
2011-02-28 14:57:54 +01:00
|
|
|
avio_seek(pb, mkv->duration_offset, SEEK_SET);
|
2007-09-05 02:26:03 +02:00
|
|
|
put_ebml_float(pb, MATROSKA_ID_DURATION, mkv->duration);
|
|
|
|
|
2011-02-28 14:57:54 +01:00
|
|
|
avio_seek(pb, currentpos, SEEK_SET);
|
2007-09-05 02:26:00 +02:00
|
|
|
}
|
2007-09-05 02:23:11 +02:00
|
|
|
|
2007-09-05 02:22:37 +02:00
|
|
|
end_ebml_master(pb, mkv->segment);
|
2010-03-09 05:23:28 +01:00
|
|
|
av_free(mkv->tracks);
|
2011-05-04 18:57:37 +02:00
|
|
|
av_freep(&mkv->cues->entries);
|
|
|
|
av_freep(&mkv->cues);
|
2012-09-09 21:35:23 +02:00
|
|
|
|
2007-09-05 02:22:37 +02:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2012-08-05 11:11:04 +02:00
|
|
|
static int mkv_query_codec(enum AVCodecID codec_id, int std_compliance)
|
2011-08-11 20:35:46 +02:00
|
|
|
{
|
|
|
|
int i;
|
2012-08-05 11:11:04 +02:00
|
|
|
for (i = 0; ff_mkv_codec_tags[i].id != AV_CODEC_ID_NONE; i++)
|
2011-08-11 20:35:46 +02:00
|
|
|
if (ff_mkv_codec_tags[i].id == codec_id)
|
|
|
|
return 1;
|
|
|
|
|
|
|
|
if (std_compliance < FF_COMPLIANCE_NORMAL) { // mkv theoretically supports any
|
|
|
|
enum AVMediaType type = avcodec_get_type(codec_id); // video/audio through VFW/ACM
|
|
|
|
if (type == AVMEDIA_TYPE_VIDEO || type == AVMEDIA_TYPE_AUDIO)
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2013-08-02 21:14:25 +02:00
|
|
|
static const AVCodecTag additional_audio_tags[] = {
|
2013-01-24 00:53:50 +01:00
|
|
|
{ AV_CODEC_ID_ALAC, 0XFFFFFFFF },
|
|
|
|
{ AV_CODEC_ID_EAC3, 0XFFFFFFFF },
|
|
|
|
{ AV_CODEC_ID_MLP, 0xFFFFFFFF },
|
|
|
|
{ AV_CODEC_ID_OPUS, 0xFFFFFFFF },
|
|
|
|
{ AV_CODEC_ID_PCM_S16BE, 0xFFFFFFFF },
|
|
|
|
{ AV_CODEC_ID_PCM_S24BE, 0xFFFFFFFF },
|
|
|
|
{ AV_CODEC_ID_PCM_S32BE, 0xFFFFFFFF },
|
|
|
|
{ AV_CODEC_ID_QDM2, 0xFFFFFFFF },
|
|
|
|
{ AV_CODEC_ID_RA_144, 0xFFFFFFFF },
|
|
|
|
{ AV_CODEC_ID_RA_288, 0xFFFFFFFF },
|
|
|
|
{ AV_CODEC_ID_COOK, 0xFFFFFFFF },
|
|
|
|
{ AV_CODEC_ID_TRUEHD, 0xFFFFFFFF },
|
|
|
|
{ AV_CODEC_ID_WAVPACK, 0xFFFFFFFF },
|
|
|
|
{ AV_CODEC_ID_NONE, 0xFFFFFFFF }
|
|
|
|
};
|
|
|
|
|
2013-08-02 21:14:25 +02:00
|
|
|
static const AVCodecTag additional_video_tags[] = {
|
2013-01-24 00:53:50 +01:00
|
|
|
{ AV_CODEC_ID_PRORES, 0xFFFFFFFF },
|
|
|
|
{ AV_CODEC_ID_RV10, 0xFFFFFFFF },
|
|
|
|
{ AV_CODEC_ID_RV20, 0xFFFFFFFF },
|
|
|
|
{ AV_CODEC_ID_RV30, 0xFFFFFFFF },
|
|
|
|
{ AV_CODEC_ID_RV40, 0xFFFFFFFF },
|
|
|
|
{ AV_CODEC_ID_VP9, 0xFFFFFFFF },
|
|
|
|
{ AV_CODEC_ID_NONE, 0xFFFFFFFF }
|
|
|
|
};
|
|
|
|
|
2013-04-30 08:36:20 +02:00
|
|
|
#define OFFSET(x) offsetof(MatroskaMuxContext, x)
|
|
|
|
#define FLAGS AV_OPT_FLAG_ENCODING_PARAM
|
|
|
|
static const AVOption options[] = {
|
|
|
|
{ "reserve_index_space", "Reserve a given amount of space (in bytes) at the beginning "
|
|
|
|
"of the file for the index (cues).", OFFSET(reserve_cues_space), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, INT_MAX, FLAGS },
|
|
|
|
{ NULL },
|
|
|
|
};
|
|
|
|
|
2010-06-05 00:40:54 +02:00
|
|
|
#if CONFIG_MATROSKA_MUXER
|
2013-04-30 08:36:20 +02:00
|
|
|
static const AVClass matroska_class = {
|
|
|
|
.class_name = "matroska muxer",
|
|
|
|
.item_name = av_default_item_name,
|
|
|
|
.option = options,
|
|
|
|
.version = LIBAVUTIL_VERSION_INT,
|
|
|
|
};
|
|
|
|
|
2011-01-25 23:03:28 +01:00
|
|
|
AVOutputFormat ff_matroska_muxer = {
|
2011-07-16 22:18:12 +02:00
|
|
|
.name = "matroska",
|
2012-07-24 23:51:41 +02:00
|
|
|
.long_name = NULL_IF_CONFIG_SMALL("Matroska"),
|
2011-07-16 22:18:12 +02:00
|
|
|
.mime_type = "video/x-matroska",
|
|
|
|
.extensions = "mkv",
|
|
|
|
.priv_data_size = sizeof(MatroskaMuxContext),
|
2012-07-22 01:44:26 +02:00
|
|
|
.audio_codec = CONFIG_LIBVORBIS_ENCODER ?
|
2012-08-05 11:11:04 +02:00
|
|
|
AV_CODEC_ID_VORBIS : AV_CODEC_ID_AC3,
|
2012-07-22 01:44:26 +02:00
|
|
|
.video_codec = CONFIG_LIBX264_ENCODER ?
|
2012-08-05 11:11:04 +02:00
|
|
|
AV_CODEC_ID_H264 : AV_CODEC_ID_MPEG4,
|
2011-07-16 22:18:12 +02:00
|
|
|
.write_header = mkv_write_header,
|
|
|
|
.write_packet = mkv_write_packet,
|
|
|
|
.write_trailer = mkv_write_trailer,
|
2011-05-26 20:19:04 +02:00
|
|
|
.flags = AVFMT_GLOBALHEADER | AVFMT_VARIABLE_FPS |
|
|
|
|
AVFMT_TS_NONSTRICT,
|
2013-01-24 00:53:50 +01:00
|
|
|
.codec_tag = (const AVCodecTag* const []){
|
|
|
|
ff_codec_bmp_tags, ff_codec_wav_tags,
|
|
|
|
additional_audio_tags, additional_video_tags, 0
|
|
|
|
},
|
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 03:06:43 +01:00
|
|
|
#if FF_API_ASS_SSA
|
2012-08-05 11:11:04 +02:00
|
|
|
.subtitle_codec = AV_CODEC_ID_SSA,
|
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 03:06:43 +01:00
|
|
|
#else
|
|
|
|
.subtitle_codec = AV_CODEC_ID_ASS,
|
|
|
|
#endif
|
2011-08-11 20:35:46 +02:00
|
|
|
.query_codec = mkv_query_codec,
|
2013-04-30 08:36:20 +02:00
|
|
|
.priv_class = &matroska_class,
|
2007-09-05 02:22:37 +02:00
|
|
|
};
|
2010-06-05 00:40:54 +02:00
|
|
|
#endif
|
|
|
|
|
|
|
|
#if CONFIG_WEBM_MUXER
|
2013-04-30 08:36:20 +02:00
|
|
|
static const AVClass webm_class = {
|
|
|
|
.class_name = "webm muxer",
|
|
|
|
.item_name = av_default_item_name,
|
|
|
|
.option = options,
|
|
|
|
.version = LIBAVUTIL_VERSION_INT,
|
|
|
|
};
|
|
|
|
|
2011-01-25 23:03:28 +01:00
|
|
|
AVOutputFormat ff_webm_muxer = {
|
2011-07-16 22:18:12 +02:00
|
|
|
.name = "webm",
|
2012-07-24 23:51:41 +02:00
|
|
|
.long_name = NULL_IF_CONFIG_SMALL("WebM"),
|
2011-07-16 22:18:12 +02:00
|
|
|
.mime_type = "video/webm",
|
|
|
|
.extensions = "webm",
|
|
|
|
.priv_data_size = sizeof(MatroskaMuxContext),
|
2012-08-05 11:11:04 +02:00
|
|
|
.audio_codec = AV_CODEC_ID_VORBIS,
|
|
|
|
.video_codec = AV_CODEC_ID_VP8,
|
2013-07-09 01:25:30 +02:00
|
|
|
.subtitle_codec = AV_CODEC_ID_WEBVTT,
|
2011-07-16 22:18:12 +02:00
|
|
|
.write_header = mkv_write_header,
|
|
|
|
.write_packet = mkv_write_packet,
|
|
|
|
.write_trailer = mkv_write_trailer,
|
2011-05-26 20:19:04 +02:00
|
|
|
.flags = AVFMT_GLOBALHEADER | AVFMT_VARIABLE_FPS |
|
|
|
|
AVFMT_TS_NONSTRICT,
|
2013-04-30 08:36:20 +02:00
|
|
|
.priv_class = &webm_class,
|
2010-06-05 00:40:54 +02:00
|
|
|
};
|
|
|
|
#endif
|
2007-09-05 02:24:19 +02:00
|
|
|
|
2010-06-05 00:40:54 +02:00
|
|
|
#if CONFIG_MATROSKA_AUDIO_MUXER
|
2013-04-30 08:36:20 +02:00
|
|
|
static const AVClass mka_class = {
|
|
|
|
.class_name = "matroska audio muxer",
|
|
|
|
.item_name = av_default_item_name,
|
|
|
|
.option = options,
|
|
|
|
.version = LIBAVUTIL_VERSION_INT,
|
|
|
|
};
|
2011-01-25 23:03:28 +01:00
|
|
|
AVOutputFormat ff_matroska_audio_muxer = {
|
2011-07-16 22:18:12 +02:00
|
|
|
.name = "matroska",
|
2013-07-16 02:36:31 +02:00
|
|
|
.long_name = NULL_IF_CONFIG_SMALL("Matroska Audio"),
|
2011-07-16 22:18:12 +02:00
|
|
|
.mime_type = "audio/x-matroska",
|
|
|
|
.extensions = "mka",
|
|
|
|
.priv_data_size = sizeof(MatroskaMuxContext),
|
2012-07-22 01:44:26 +02:00
|
|
|
.audio_codec = CONFIG_LIBVORBIS_ENCODER ?
|
2012-08-05 11:11:04 +02:00
|
|
|
AV_CODEC_ID_VORBIS : AV_CODEC_ID_AC3,
|
|
|
|
.video_codec = AV_CODEC_ID_NONE,
|
2011-07-16 22:18:12 +02:00
|
|
|
.write_header = mkv_write_header,
|
|
|
|
.write_packet = mkv_write_packet,
|
|
|
|
.write_trailer = mkv_write_trailer,
|
2011-05-26 20:19:04 +02:00
|
|
|
.flags = AVFMT_GLOBALHEADER | AVFMT_TS_NONSTRICT,
|
2013-01-24 00:53:50 +01:00
|
|
|
.codec_tag = (const AVCodecTag* const []){
|
|
|
|
ff_codec_wav_tags, additional_audio_tags, 0
|
|
|
|
},
|
2013-04-30 08:36:20 +02:00
|
|
|
.priv_class = &mka_class,
|
2007-09-05 02:24:19 +02:00
|
|
|
};
|
2010-06-05 00:40:54 +02:00
|
|
|
#endif
|