X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=libhb%2Fmuxmkv.c;h=6217820b587441f3b4a01ddbc1f527d653bb3cd8;hb=07cc0ebf6a7141a76fd9b6e2da6cf510def1ebc7;hp=1f5d4ae48067791d34ce6808149c883ff560a4c9;hpb=beb5e007e4f73c7c2972a29297cfdb92964545cf;p=handbrake-jp%2Fhandbrake-jp-git.git
diff --git a/libhb/muxmkv.c b/libhb/muxmkv.c
index 1f5d4ae4..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 */
@@ -29,6 +29,7 @@ struct hb_mux_data_s
mk_Track * track;
uint64_t prev_chapter_tc;
uint16_t current_chapter;
+ int codec;
};
/**********************************************************************
@@ -106,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_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;
}
@@ -136,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;
@@ -158,8 +183,8 @@ static int MKVInit( hb_mux_object_t * m )
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 );
+ 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);
@@ -173,16 +198,16 @@ static int MKVInit( hb_mux_object_t * m )
}
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_error("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;
@@ -190,12 +215,12 @@ static int MKVInit( hb_mux_object_t * m )
}
track->flagEnabled = 1;
track->trackType = MK_TRACK_AUDIO;
- track->language = audio->iso639_2;
- track->audio.samplingFreq = (float)job->arate;
- track->audio.channels = (job->acodec == HB_ACODEC_AC3) ? HB_INPUT_CH_LAYOUT_GET_DISCRETE_COUNT(audio->input_channel_layout) : 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);
}
@@ -215,30 +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 */
- if ((job->vcodec == HB_VCODEC_X264) && (job->areBframes))
- {
- timecode = (buf->start + (buf->renderOffset)) * TIMECODE_SCALE;
- }
- else
- {
- timecode = buf->start * TIMECODE_SCALE;
- }
+ 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 )
@@ -255,19 +280,36 @@ static int MKVMux( hb_mux_object_t * m, hb_mux_data_t * mux_data,
}
mux_data->prev_chapter_tc = timecode;
}
+
+ 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 * TIMECODE_SCALE;
- if (job->acodec == HB_ACODEC_VORBIS)
+ 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;