X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=libhb%2Fmuxogm.c;h=885dcca95a2bfe65909238250ddcef4bbfa28315;hb=033e32de9c380f54c7d1362a3979da205ebc3a29;hp=433122448358db6281050e386fc7568714340c18;hpb=4e3f08663b249ff5604e4de3878a226b21f342dc;p=handbrake-jp%2Fhandbrake-jp-git.git

diff --git a/libhb/muxogm.c b/libhb/muxogm.c
index 43312244..885dcca9 100644
--- a/libhb/muxogm.c
+++ b/libhb/muxogm.c
@@ -1,7 +1,7 @@
 /* $Id: muxogm.c,v 1.4 2005/02/20 00:41:56 titer Exp $
 
    This file is part of the HandBrake source code.
-   Homepage: <http://handbrake.m0k.org/>.
+   Homepage: <http://handbrake.fr/>.
    It may be used under the terms of the GNU General Public License. */
 
 #include "hb.h"
@@ -135,9 +135,9 @@ static int OGMInit( hb_mux_object_t * m )
     {
         audio                 = hb_list_item( title->list_audio, i );
         mux_data              = malloc( sizeof( hb_mux_data_t ) );
-        mux_data->codec       = job->acodec;
+        mux_data->codec       = audio->config.out.codec;
         mux_data->i_packet_no = 0;
-        audio->mux_data       = mux_data;
+        audio->priv.mux_data       = mux_data;
         ogg_stream_init( &mux_data->os, i + 1 );
     }
 
@@ -153,7 +153,6 @@ static int OGMInit( hb_mux_object_t * m )
             op.packet = job->config.theora.headers[0] + sizeof(op);
             ogg_stream_packetin( &mux_data->os, &op );
             break;
-        case HB_VCODEC_XVID:
         case HB_VCODEC_X264:
         case HB_VCODEC_FFMPEG:
         {
@@ -164,10 +163,6 @@ static int OGMInit( hb_mux_object_t * m )
                 {
                     memcpy( h.sub_type, "H264", 4 );
                 }
-                else if( mux_data->codec == HB_VCODEC_XVID )
-                {
-                    memcpy( h.sub_type, "XVID", 4 );
-                }
                 else
                 {
                     memcpy( h.sub_type, "DX50", 4 );
@@ -200,9 +195,9 @@ static int OGMInit( 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 = audio->mux_data;
+        mux_data = audio->priv.mux_data;
         memset( &h, 0, sizeof( ogg_stream_header_t ) );
-        switch( job->acodec )
+        switch( audio->config.out.codec )
         {
             case HB_ACODEC_LAME:
             {
@@ -212,7 +207,7 @@ static int OGMInit( hb_mux_object_t * m )
 
                 SetDWLE( &h.i_size, sizeof( ogg_stream_header_t ) - 1);
                 SetQWLE( &h.i_time_unit, 0 );
-                SetQWLE( &h.i_samples_per_unit, job->arate );
+                SetQWLE( &h.i_samples_per_unit, audio->config.out.samplerate );
                 SetDWLE( &h.i_default_len, 1 );
                 SetDWLE( &h.i_buffer_size, 30 * 1024 );
                 SetWLE ( &h.i_bits_per_sample, 0 );
@@ -220,7 +215,7 @@ static int OGMInit( hb_mux_object_t * m )
                 SetDWLE( &h.header.audio.i_channels, 2 );
                 SetDWLE( &h.header.audio.i_block_align, 0 );
                 SetDWLE( &h.header.audio.i_avgbytespersec,
-                         job->abitrate / 8 );
+                         audio->config.out.bitrate / 8 );
 
                 op.packet   = (unsigned char*) &h;
                 op.bytes    = sizeof( ogg_stream_header_t );
@@ -233,9 +228,9 @@ static int OGMInit( hb_mux_object_t * m )
             }
             case HB_ACODEC_VORBIS:
             {
-                memcpy( &op, audio->config.vorbis.headers[0],
+                memcpy( &op, audio->priv.config.vorbis.headers[0],
                         sizeof( ogg_packet ) );
-                op.packet = audio->config.vorbis.headers[0] +
+                op.packet = audio->priv.config.vorbis.headers[0] +
                                 sizeof( ogg_packet );
                 ogg_stream_packetin( &mux_data->os, &op );
                 break;
@@ -262,7 +257,6 @@ static int OGMInit( hb_mux_object_t * m )
                 OGMFlush( m, mux_data );
             }
             break;
-        case HB_VCODEC_XVID:
         case HB_VCODEC_X264:
         case HB_VCODEC_FFMPEG:
             break;
@@ -275,16 +269,16 @@ static int OGMInit( hb_mux_object_t * m )
     for( i = 0; i < hb_list_count( title->list_audio ); i++ )
     {
         audio = hb_list_item( title->list_audio, i );
-        if( job->acodec == HB_ACODEC_VORBIS )
+        if( audio->config.out.codec == HB_ACODEC_VORBIS )
         {
             int       j;
-            mux_data = audio->mux_data;
+            mux_data = audio->priv.mux_data;
 
             for( j = 1; j < 3; j++ )
             {
-                memcpy( &op, audio->config.vorbis.headers[j],
+                memcpy( &op, audio->priv.config.vorbis.headers[j],
                         sizeof( ogg_packet ) );
-                op.packet = audio->config.vorbis.headers[j] +
+                op.packet = audio->priv.config.vorbis.headers[j] +
                                 sizeof( ogg_packet );
                 ogg_stream_packetin( &mux_data->os, &op );
 
@@ -310,7 +304,6 @@ static int OGMMux( hb_mux_object_t * m, hb_mux_data_t * mux_data,
             memcpy( op.packet, buf->data + sizeof( ogg_packet ), op.bytes );
             break;
         case HB_VCODEC_FFMPEG:
-        case HB_VCODEC_XVID:
         case HB_VCODEC_X264:
             op.bytes  = buf->size + 1;
             op.packet = malloc( op.bytes );
@@ -387,7 +380,7 @@ static int OGMEnd( 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 = audio->mux_data;
+        mux_data = audio->priv.mux_data;
         if( OGMFlush( m, mux_data ) < 0 )
         {
             return -1;