X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=libhb%2Fmuxmkv.c;h=6217820b587441f3b4a01ddbc1f527d653bb3cd8;hb=07cc0ebf6a7141a76fd9b6e2da6cf510def1ebc7;hp=9bb4ece58b78437fbbf1896c4a5f2041dd7fd0bb;hpb=142413056710cc2f6590036755546c4075427780;p=handbrake-jp%2Fhandbrake-jp-git.git
diff --git a/libhb/muxmkv.c b/libhb/muxmkv.c
index 9bb4ece5..6217820b 100644
--- a/libhb/muxmkv.c
+++ b/libhb/muxmkv.c
@@ -1,7 +1,7 @@
/* $Id: $
This file is part of the HandBrake source code.
- Homepage: .
+ Homepage: .
It may be used under the terms of the GNU General Public License. */
/* libmkv header */
@@ -11,6 +11,10 @@
#include "hb.h"
+/* Scale factor to apply to timecodes to convert from HandBrake's
+ * 1/90000s to nanoseconds as expected by libmkv */
+#define TIMECODE_SCALE 1000000000 / 90000
+
struct hb_mux_object_s
{
HB_MUX_COMMON;
@@ -24,8 +28,8 @@ struct hb_mux_data_s
{
mk_Track * track;
uint64_t prev_chapter_tc;
- uint64_t max_tc;
uint16_t current_chapter;
+ int codec;
};
/**********************************************************************
@@ -50,12 +54,21 @@ static int MKVInit( hb_mux_object_t * m )
m->file = mk_createWriter(job->file, 1000000, 1);
+ if( !m->file )
+ {
+ hb_error( "Could not create output file, Disk Full?" );
+ job->mux_data = NULL;
+ *job->die = 1;
+ return 0;
+ }
+
/* Video track */
mux_data = calloc(1, sizeof( hb_mux_data_t ) );
job->mux_data = mux_data;
track->trackType = MK_TRACK_VIDEO;
track->flagDefault = 1;
+ track->flagEnabled = 1;
switch (job->vcodec)
{
case HB_VCODEC_X264:
@@ -85,6 +98,8 @@ static int MKVInit( hb_mux_object_t * m )
memcpy( avcC+11+job->config.h264.sps_length, job->config.h264.pps, job->config.h264.pps_length );
track->codecPrivate = avcC;
track->codecPrivateSize = avcC_len;
+ if (job->areBframes)
+ track->minCache = 1;
break;
case HB_VCODEC_XVID:
case HB_VCODEC_FFMPEG:
@@ -92,22 +107,44 @@ static int MKVInit( hb_mux_object_t * m )
track->codecPrivate = job->config.mpeg4.bytes;
track->codecPrivateSize = job->config.mpeg4.length;
break;
+ case HB_VCODEC_THEORA:
+ {
+ int i;
+ uint64_t cp_size = 0;
+ track->codecID = MK_VCODEC_THEORA;
+ uint64_t header_sizes[3];
+ for (i = 0; i < 3; ++i)
+ {
+ ogg_headers[i] = (ogg_packet *)job->config.theora.headers[i];
+ ogg_headers[i]->packet = (unsigned char *)&job->config.theora.headers[i] + sizeof( ogg_packet );
+ header_sizes[i] = ogg_headers[i]->bytes;
+ }
+ track->codecPrivate = mk_laceXiph(header_sizes, 2, &cp_size);
+ track->codecPrivate = realloc(track->codecPrivate, cp_size + ogg_headers[0]->bytes + ogg_headers[1]->bytes + ogg_headers[2]->bytes);
+ for(i = 0; i < 3; ++i)
+ {
+ memcpy(track->codecPrivate + cp_size, ogg_headers[i]->packet, ogg_headers[i]->bytes);
+ cp_size += ogg_headers[i]->bytes;
+ }
+ track->codecPrivateSize = cp_size;
+ }
+ break;
default:
*job->die = 1;
- hb_log("muxmkv: Unknown video codec: %x", job->vcodec);
+ hb_error("muxmkv: Unknown video codec: %x", job->vcodec);
return 0;
}
- track->video.pixelWidth = job->width;
- track->video.pixelHeight = job->height;
- track->video.displayHeight = job->height;
+ track->extra.video.pixelWidth = job->width;
+ track->extra.video.pixelHeight = job->height;
+ track->extra.video.displayHeight = job->height;
if(job->pixel_ratio)
{
- track->video.displayWidth = job->width * ((double)job->pixel_aspect_width / (double)job->pixel_aspect_height);
+ track->extra.video.displayWidth = job->width * ((double)job->pixel_aspect_width / (double)job->pixel_aspect_height);
}
else
{
- track->video.displayWidth = job->width;
+ track->extra.video.displayWidth = job->width;
}
@@ -122,9 +159,11 @@ static int MKVInit( hb_mux_object_t * m )
{
audio = hb_list_item( title->list_audio, i );
mux_data = malloc( sizeof( hb_mux_data_t ) );
- audio->mux_data = mux_data;
+ audio->priv.mux_data = mux_data;
+
+ mux_data->codec = audio->config.out.codec;
- switch (job->acodec)
+ switch (audio->config.out.codec)
{
case HB_ACODEC_AC3:
track->codecPrivate = NULL;
@@ -138,65 +177,58 @@ static int MKVInit( hb_mux_object_t * m )
break;
case HB_ACODEC_VORBIS:
{
- int i, j;
- int64_t offset = 0;
- int64_t cp_size = 0;
- char *cp;
+ int i;
+ uint64_t cp_size = 0;
track->codecID = MK_ACODEC_VORBIS;
- cp_size = sizeof( char );
+ uint64_t header_sizes[3];
for (i = 0; i < 3; ++i)
{
- ogg_headers[i] = (ogg_packet *)audio->config.vorbis.headers[i];
- ogg_headers[i]->packet = (unsigned char *)&audio->config.vorbis.headers[i] + sizeof( ogg_packet );
- cp_size += (sizeof( char ) * ((ogg_headers[i]->bytes / 255) + 1)) + ogg_headers[i]->bytes;
- /* This will be too big, but it doesn't matter, as we only need it to be big enough. */
- }
- cp = track->codecPrivate = calloc(1, cp_size);
- cp[offset++] = 0x02;
- for (i = 0; i < 2; ++i)
- {
- for (j = ogg_headers[i]->bytes; j >= 255; j -= 255)
- {
- cp[offset++] = 255;
- }
- cp[offset++] = j;
+ ogg_headers[i] = (ogg_packet *)audio->priv.config.vorbis.headers[i];
+ ogg_headers[i]->packet = (unsigned char *)&audio->priv.config.vorbis.headers[i] + sizeof( ogg_packet );
+ header_sizes[i] = ogg_headers[i]->bytes;
}
+ track->codecPrivate = mk_laceXiph(header_sizes, 2, &cp_size);
+ track->codecPrivate = realloc(track->codecPrivate, cp_size + ogg_headers[0]->bytes + ogg_headers[1]->bytes + ogg_headers[2]->bytes);
for(i = 0; i < 3; ++i)
{
- memcpy(cp + offset, ogg_headers[i]->packet, ogg_headers[i]->bytes);
- offset += ogg_headers[i]->bytes;
+ memcpy(track->codecPrivate + cp_size, ogg_headers[i]->packet, ogg_headers[i]->bytes);
+ cp_size += ogg_headers[i]->bytes;
}
- track->codecPrivateSize = offset;
+ track->codecPrivateSize = cp_size;
}
break;
case HB_ACODEC_FAAC:
- track->codecPrivate = audio->config.aac.bytes;
- track->codecPrivateSize = audio->config.aac.length;
+ track->codecPrivate = audio->priv.config.aac.bytes;
+ track->codecPrivateSize = audio->priv.config.aac.length;
track->codecID = MK_ACODEC_AAC;
break;
default:
*job->die = 1;
- hb_log("muxmkv: Unknown audio codec: %x", job->acodec);
+ hb_error("muxmkv: Unknown audio codec: %x", audio->config.out.codec);
return 0;
}
-
+
if (default_track_flag)
{
track->flagDefault = 1;
default_track_flag = 0;
}
-
+ track->flagEnabled = 1;
track->trackType = MK_TRACK_AUDIO;
- track->language = audio->iso639_2;
- track->audio.samplingFreq = (float)job->arate;
- track->audio.channels = HB_AMIXDOWN_GET_DISCRETE_CHANNEL_COUNT(audio->amixdown);
+ track->language = audio->config.lang.iso639_2;
+ track->extra.audio.samplingFreq = (float)audio->config.out.samplerate;
+ track->extra.audio.channels = (audio->config.out.codec == HB_ACODEC_AC3 ) ? HB_INPUT_CH_LAYOUT_GET_DISCRETE_COUNT(audio->config.in.channel_layout) : HB_AMIXDOWN_GET_DISCRETE_CHANNEL_COUNT(audio->config.out.mixdown);
// track->defaultDuration = job->arate * 1000;
mux_data->track = mk_createTrack(m->file, track);
- if (job->acodec == HB_ACODEC_VORBIS && track->codecPrivate != NULL)
+ if (audio->config.out.codec == HB_ACODEC_VORBIS && track->codecPrivate != NULL)
free(track->codecPrivate);
}
- mk_writeHeader( m->file, "HandBrake " HB_VERSION);
+ if( mk_writeHeader( m->file, "HandBrake " HB_VERSION) < 0 )
+ {
+ hb_error( "Failed to write to output file, disk full?");
+ *job->die = 1;
+ }
if (track != NULL)
free(track);
if (avcC != NULL)
@@ -208,33 +240,30 @@ static int MKVInit( hb_mux_object_t * m )
static int MKVMux( hb_mux_object_t * m, hb_mux_data_t * mux_data,
hb_buffer_t * buf )
{
+ ogg_packet *op = NULL;
hb_job_t * job = m->job;
hb_title_t * title = job->title;
uint64_t timecode = 0;
hb_chapter_t *chapter_data;
char tmp_buffer[1024];
char *string = tmp_buffer;
+
if (mux_data == job->mux_data)
{
/* Video */
- /* Where does the 11130 come from? I had to calculate it from the actual
- * and the observed duration of the file. Otherwise the timecodes come
- * out way too small, and you get a 2hr movie that plays in .64 sec. */
- if ((job->vcodec == HB_VCODEC_X264) && (buf->frametype & HB_FRAME_REF))
- {
- timecode = (buf->start + (buf->renderOffset - 1000000)) * 11130;
- }
- else
- {
- timecode = buf->start * 11130;
- }
+ timecode = buf->start * TIMECODE_SCALE;
if (job->chapter_markers && (buf->new_chap || timecode == 0))
{
/* Make sure we're not writing a chapter that has 0 length */
if (mux_data->prev_chapter_tc != timecode)
{
- chapter_data = hb_list_item( title->list_chapter, mux_data->current_chapter );
+ if ( buf->new_chap )
+ {
+ mux_data->current_chapter = buf->new_chap - 2;
+ }
+ chapter_data = hb_list_item( title->list_chapter,
+ mux_data->current_chapter++ );
tmp_buffer[0] = '\0';
if( chapter_data != NULL )
@@ -244,39 +273,57 @@ static int MKVMux( hb_mux_object_t * m, hb_mux_data_t * mux_data,
if( strlen(string) == 0 || strlen(string) >= 1024 )
{
- snprintf( tmp_buffer, 1023, "Chapter %02i", mux_data->current_chapter++ );
+ snprintf( tmp_buffer, 1023, "Chapter %02i", mux_data->current_chapter );
string = tmp_buffer;
}
- mk_createChapterSimple(m->file, mux_data->prev_chapter_tc, timecode, string);
+ mk_createChapterSimple(m->file, mux_data->prev_chapter_tc, mux_data->prev_chapter_tc, string);
}
mux_data->prev_chapter_tc = timecode;
}
- if (buf->stop * 11130 > mux_data->max_tc)
- mux_data->max_tc = buf->stop * 11130;
+ if (job->vcodec == HB_VCODEC_THEORA)
+ {
+ /* ughhh, theora is a pain :( */
+ op = (ogg_packet *)buf->data;
+ op->packet = buf->data + sizeof( ogg_packet );
+ if (mk_startFrame(m->file, mux_data->track) < 0)
+ {
+ hb_error( "Failed to write frame to output file, Disk Full?" );
+ *job->die = 1;
+ }
+ mk_addFrameData(m->file, mux_data->track, op->packet, op->bytes);
+ mk_setFrameFlags(m->file, mux_data->track, timecode, 1);
+ return 0;
+ }
}
else
{
/* Audio */
- timecode = buf->start * 11130;
- if (job->acodec == HB_ACODEC_VORBIS)
+ timecode = buf->start * TIMECODE_SCALE;
+ if (mux_data->codec == HB_ACODEC_VORBIS)
{
/* ughhh, vorbis is a pain :( */
- ogg_packet *op;
-
op = (ogg_packet *)buf->data;
op->packet = buf->data + sizeof( ogg_packet );
- mk_startFrame(m->file, mux_data->track);
+ if (mk_startFrame(m->file, mux_data->track))
+ {
+ hb_error( "Failed to write frame to output file, Disk Full?" );
+ *job->die = 1;
+ }
mk_addFrameData(m->file, mux_data->track, op->packet, op->bytes);
mk_setFrameFlags(m->file, mux_data->track, timecode, 1);
return 0;
}
}
- mk_startFrame(m->file, mux_data->track);
+ if( mk_startFrame(m->file, mux_data->track) < 0)
+ {
+ hb_error( "Failed to write frame to output file, Disk Full?" );
+ *job->die = 1;
+ }
mk_addFrameData(m->file, mux_data->track, buf->data, buf->size);
mk_setFrameFlags(m->file, mux_data->track, timecode,
- ((job->vcodec == HB_VCODEC_X264 && mux_data == job->mux_data) ? (buf->frametype == HB_FRAME_IDR) : ((buf->frametype & HB_FRAME_KEY) != 0)) );
+ ((job->vcodec == HB_VCODEC_X264 && mux_data == job->mux_data) ? (buf->frametype == HB_FRAME_IDR) : ((buf->frametype & HB_FRAME_KEY) != 0)) );
return 0;
}
@@ -285,10 +332,20 @@ static int MKVEnd( hb_mux_object_t * m )
hb_job_t *job = m->job;
hb_mux_data_t *mux_data = job->mux_data;
hb_title_t *title = job->title;
- hb_chapter_t *chapter_data = hb_list_item( title->list_chapter, mux_data->current_chapter );
+ hb_chapter_t *chapter_data;
char tmp_buffer[1024];
char *string = tmp_buffer;
+ if( !job->mux_data )
+ {
+ /*
+ * We must have failed to create the file in the first place.
+ */
+ return 0;
+ }
+
+ chapter_data = hb_list_item( title->list_chapter, mux_data->current_chapter++ );
+
if(job->chapter_markers)
{
tmp_buffer[0] = '\0';
@@ -303,10 +360,14 @@ static int MKVEnd( hb_mux_object_t * m )
snprintf( tmp_buffer, 1023, "Chapter %02i", mux_data->current_chapter );
string = tmp_buffer;
}
- mk_createChapterSimple(m->file, mux_data->prev_chapter_tc, mux_data->max_tc, string);
+ mk_createChapterSimple(m->file, mux_data->prev_chapter_tc, mux_data->prev_chapter_tc, string);
}
- mk_close(m->file);
+ if( mk_close(m->file) < 0 )
+ {
+ hb_error( "Failed to flush the last frame and close the output file, Disk Full?" );
+ *job->die = 1;
+ }
// TODO: Free what we alloc'd