X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=libhb%2Fmuxmkv.c;h=2e8814ca9283ad588ade2aaad6ecbf4711bfa855;hb=0f7cba7abcdf2d40f125f734839dfdfaa264c70d;hp=6ed6a6decc3d208b44f85498a4642f3cbb044a2f;hpb=4e3f08663b249ff5604e4de3878a226b21f342dc;p=handbrake-jp%2Fhandbrake-jp-git.git
diff --git a/libhb/muxmkv.c b/libhb/muxmkv.c
index 6ed6a6de..2e8814ca 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,8 +29,32 @@ struct hb_mux_data_s
mk_Track * track;
uint64_t prev_chapter_tc;
uint16_t current_chapter;
+ int codec;
+ int subtitle;
+ int sub_format;
};
+static int yuv2rgb(int yuv)
+{
+ double y, Cr, Cb;
+ int r, g, b;
+
+ y = (yuv >> 16) & 0xff;
+ Cb = (yuv >> 8) & 0xff;
+ Cr = (yuv ) & 0xff;
+
+ r = 1.164 * (y - 16) + 2.018 * (Cb - 128);
+ g = 1.164 * (y - 16) - 0.813 * (Cr - 128) - 0.391 * (Cb - 128);
+ b = 1.164 * (y - 16) + 1.596 * (Cr - 128);
+ r = (r < 0) ? 0 : r;
+ g = (g < 0) ? 0 : g;
+ b = (b < 0) ? 0 : b;
+ r = (r > 255) ? 255 : r;
+ g = (g > 255) ? 255 : g;
+ b = (b > 255) ? 255 : b;
+ return (r << 16) | (g << 8) | b;
+}
+
/**********************************************************************
* MKVInit
**********************************************************************
@@ -45,7 +69,7 @@ static int MKVInit( hb_mux_object_t * m )
uint8_t *avcC = NULL;
uint8_t default_track_flag = 1;
- int avcC_len, i;
+ int avcC_len, i, j;
ogg_packet *ogg_headers[3];
mk_TrackConfig *track;
@@ -100,7 +124,6 @@ static int MKVInit( hb_mux_object_t * m )
if (job->areBframes)
track->minCache = 1;
break;
- case HB_VCODEC_XVID:
case HB_VCODEC_FFMPEG:
track->codecID = MK_VCODEC_MP4ASP;
track->codecPrivate = job->config.mpeg4.bytes;
@@ -137,9 +160,9 @@ static int MKVInit( hb_mux_object_t * m )
track->extra.video.pixelWidth = job->width;
track->extra.video.pixelHeight = job->height;
track->extra.video.displayHeight = job->height;
- if(job->pixel_ratio)
+ if( job->anamorphic.mode )
{
- track->extra.video.displayWidth = job->width * ((double)job->pixel_aspect_width / (double)job->pixel_aspect_height);
+ track->extra.video.displayWidth = job->width * ((double)job->anamorphic.par_width / (double)job->anamorphic.par_height);
}
else
{
@@ -157,11 +180,18 @@ static int MKVInit( hb_mux_object_t * m )
for( i = 0; i < hb_list_count( title->list_audio ); i++ )
{
audio = hb_list_item( title->list_audio, i );
- mux_data = malloc( sizeof( hb_mux_data_t ) );
- audio->mux_data = mux_data;
+ mux_data = calloc(1, sizeof( hb_mux_data_t ) );
+ audio->priv.mux_data = mux_data;
+
+ mux_data->codec = audio->config.out.codec;
- switch (job->acodec)
+ switch (audio->config.out.codec)
{
+ case HB_ACODEC_DCA:
+ track->codecPrivate = NULL;
+ track->codecPrivateSize = 0;
+ track->codecID = MK_ACODEC_DTS;
+ break;
case HB_ACODEC_AC3:
track->codecPrivate = NULL;
track->codecPrivateSize = 0;
@@ -180,8 +210,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);
@@ -195,22 +225,14 @@ static int MKVInit( hb_mux_object_t * m )
}
break;
case HB_ACODEC_FAAC:
- if( job->audio_mixdowns[i] == HB_AMIXDOWN_AC3 )
- {
- track->codecPrivate = NULL;
- track->codecPrivateSize = 0;
- track->codecID = MK_ACODEC_AC3;
- }
- else
- {
- track->codecPrivate = audio->config.aac.bytes;
- track->codecPrivateSize = audio->config.aac.length;
- track->codecID = MK_ACODEC_AAC;
- }
+ case HB_ACODEC_CA_AAC:
+ 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;
}
@@ -219,18 +241,96 @@ static int MKVInit( hb_mux_object_t * m )
track->flagDefault = 1;
default_track_flag = 0;
}
+ else
+ {
+ track->flagDefault = 0;
+ }
track->flagEnabled = 1;
track->trackType = MK_TRACK_AUDIO;
- track->language = audio->iso639_2;
- track->extra.audio.samplingFreq = (float)job->arate;
- track->extra.audio.channels = (job->acodec == HB_ACODEC_AC3 || job->audio_mixdowns[i] == HB_AMIXDOWN_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;
+ if (audio->config.out.codec == HB_ACODEC_AC3 ||
+ audio->config.out.codec == HB_ACODEC_DCA)
+ {
+ track->extra.audio.channels = HB_INPUT_CH_LAYOUT_GET_DISCRETE_COUNT(audio->config.in.channel_layout);
+ }
+ else
+ {
+ track->extra.audio.channels = 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);
}
- if( mk_writeHeader( m->file, "HandBrake " HB_VERSION) < 0 )
+ char * subidx_fmt =
+ "size: %dx%d\n"
+ "org: %d, %d\n"
+ "scale: 100%%, 100%%\n"
+ "alpha: 100%%\n"
+ "smooth: OFF\n"
+ "fadein/out: 50, 50\n"
+ "align: OFF at LEFT TOP\n"
+ "time offset: 0\n"
+ "forced subs: %s\n"
+ "palette: %06x, %06x, %06x, %06x, %06x, %06x, "
+ "%06x, %06x, %06x, %06x, %06x, %06x, %06x, %06x, %06x, %06x\n"
+ "custom colors: OFF, tridx: 0000, "
+ "colors: 000000, 000000, 000000, 000000\n";
+
+ for( i = 0; i < hb_list_count( title->list_subtitle ); i++ )
+ {
+ hb_subtitle_t * subtitle;
+ uint32_t rgb[16];
+ char subidx[2048];
+ int len;
+
+ subtitle = hb_list_item( title->list_subtitle, i );
+ if (subtitle->config.dest != PASSTHRUSUB)
+ continue;
+
+ memset(track, 0, sizeof(mk_TrackConfig));
+ switch (subtitle->format)
+ {
+ case PICTURESUB:
+ track->codecID = MK_SUBTITLE_VOBSUB;
+ for (j = 0; j < 16; j++)
+ rgb[j] = yuv2rgb(title->palette[j]);
+ len = snprintf(subidx, 2048, subidx_fmt,
+ title->width, title->height,
+ 0, 0, "OFF",
+ rgb[0], rgb[1], rgb[2], rgb[3],
+ rgb[4], rgb[5], rgb[6], rgb[7],
+ rgb[8], rgb[9], rgb[10], rgb[11],
+ rgb[12], rgb[13], rgb[14], rgb[15]);
+ track->codecPrivate = subidx;
+ track->codecPrivateSize = len + 1;
+ break;
+ case TEXTSUB:
+ track->codecID = MK_SUBTITLE_UTF8;
+ break;
+ default:
+ continue;
+ }
+ if ( subtitle->config.default_track )
+ {
+ track->flagDefault = 1;
+ }
+
+ mux_data = calloc(1, sizeof( hb_mux_data_t ) );
+ subtitle->mux_data = mux_data;
+ mux_data->subtitle = 1;
+ mux_data->sub_format = subtitle->format;
+
+ track->flagEnabled = 1;
+ track->trackType = MK_TRACK_SUBTITLE;
+ track->language = subtitle->iso639_2;
+
+ mux_data->track = mk_createTrack(m->file, track);
+ }
+
+ if( mk_writeHeader( m->file, "HandBrake " HB_PROJECT_VERSION) < 0 )
{
hb_error( "Failed to write to output file, disk full?");
*job->die = 1;
@@ -257,21 +357,19 @@ static int MKVMux( hb_mux_object_t * m, hb_mux_data_t * mux_data,
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 )
@@ -300,15 +398,39 @@ static int MKVMux( hb_mux_object_t * m, hb_mux_data_t * mux_data,
*job->die = 1;
}
mk_addFrameData(m->file, mux_data->track, op->packet, op->bytes);
- mk_setFrameFlags(m->file, mux_data->track, timecode, 1);
+ mk_setFrameFlags(m->file, mux_data->track, timecode, 1, 0);
return 0;
}
}
+ else if ( mux_data->subtitle )
+ {
+ timecode = buf->start * TIMECODE_SCALE;
+ if( mk_startFrame(m->file, mux_data->track) < 0)
+ {
+ hb_error( "Failed to write frame to output file, Disk Full?" );
+ *job->die = 1;
+ }
+ if( mux_data->sub_format == TEXTSUB )
+ {
+ uint64_t duration;
+
+ duration = buf->stop * TIMECODE_SCALE - timecode;
+ mk_addFrameData(m->file, mux_data->track, buf->data, buf->size);
+ mk_setFrameFlags(m->file, mux_data->track, timecode, 1, duration);
+ }
+ else
+ {
+ mk_addFrameData(m->file, mux_data->track, buf->data, buf->size);
+ mk_setFrameFlags(m->file, mux_data->track, timecode, 1, 0);
+ }
+ mk_flushFrame(m->file, mux_data->track);
+ 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 :( */
op = (ogg_packet *)buf->data;
@@ -319,7 +441,7 @@ static int MKVMux( hb_mux_object_t * m, hb_mux_data_t * mux_data,
*job->die = 1;
}
mk_addFrameData(m->file, mux_data->track, op->packet, op->bytes);
- mk_setFrameFlags(m->file, mux_data->track, timecode, 1);
+ mk_setFrameFlags(m->file, mux_data->track, timecode, 1, 0);
return 0;
}
}
@@ -331,7 +453,10 @@ static int MKVMux( hb_mux_object_t * m, hb_mux_data_t * mux_data,
}
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)), 0 );
return 0;
}
@@ -371,6 +496,20 @@ static int MKVEnd( hb_mux_object_t * m )
mk_createChapterSimple(m->file, mux_data->prev_chapter_tc, mux_data->prev_chapter_tc, string);
}
+ if( title->metadata )
+ {
+ hb_metadata_t *md = title->metadata;
+
+ hb_deep_log( 2, "Writing Metadata to output file...");
+ mk_createTagSimple( m->file, MK_TAG_TITLE, md->name );
+ mk_createTagSimple( m->file, "ARTIST", md->artist );
+ mk_createTagSimple( m->file, "COMPOSER", md->composer );
+ mk_createTagSimple( m->file, MK_TAG_SYNOPSIS, md->comment );
+ mk_createTagSimple( m->file, "DATE_RELEASED", md->release_date );
+ // mk_createTagSimple( m->file, "", md->album );
+ mk_createTagSimple( m->file, MK_TAG_GENRE, md->genre );
+ }
+
if( mk_close(m->file) < 0 )
{
hb_error( "Failed to flush the last frame and close the output file, Disk Full?" );