These calls to free produce double free warnings. It seems that removing the avpictur...

[handbrake-jp/handbrake-jp-git.git] / libhb / muxmkv.c

diff --git a/libhb/muxmkv.c b/libhb/muxmkv.c
index 9fbbf35..b7c7d2d 100644 (file)
--- a/libhb/muxmkv.c
+++ b/libhb/muxmkv.c
@@ -53,6 +53,14 @@ 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;
@@ -100,7 +108,7 @@ static int MKVInit( hb_mux_object_t * m )
             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;
     }
 
@@ -144,35 +152,24 @@ 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;
+                        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:
@@ -182,7 +179,7 @@ static int MKVInit( hb_mux_object_t * m )
                 break;
             default:
                 *job->die = 1;
-                hb_log("muxmkv: Unknown audio codec: %x", job->acodec);
+                hb_error("muxmkv: Unknown audio codec: %x", job->acodec);
                 return 0;
         }
         
@@ -202,7 +199,11 @@ static int MKVInit( hb_mux_object_t * m )
           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)
@@ -273,10 +274,14 @@ static int MKVMux( hb_mux_object_t * m, hb_mux_data_t * mux_data,
         }
     }
 
-    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 +290,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';
@@ -306,7 +321,11 @@ static int MKVEnd( hb_mux_object_t * m )
         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