ijksdl: fix incorrect memset

ijkmediaplayer/jni/ijksdl/android/ijksdl_vout_android_nativewindow.c

@@ -110,6 +110,7 @@ static SDL_VoutSurface *vout_set_video_mode(SDL_Vout *vout, int w, int h, int bp
 
 static void vout_copy_image_yv12(ANativeWindow_Buffer *out_buffer, const SDL_VoutOverlay *overlay)
 {
+    SDLTRACE("SDL_VoutAndroid: vout_copy_image_yv12(%p)", overlay);
     assert(overlay->format == SDL_YV12_OVERLAY);
     assert(overlay->planes == 3);
 
@@ -145,6 +146,7 @@ static void vout_copy_image_yv12(ANativeWindow_Buffer *out_buffer, const SDL_Vou
 
 static int voud_display_overlay_l(SDL_Vout *vout, SDL_VoutOverlay *overlay)
 {
+    SDLTRACE("SDL_VoutAndroid: display(%p)", overlay);
     SDL_Vout_Opaque *opaque = vout->opaque;
     ANativeWindow *native_window = opaque->native_window;
     int curr_w, curr_h, curr_format;

ijkmediaplayer/jni/ijksdl/ijksdl_vout_internal.h

@@ -38,7 +38,7 @@ inline static SDL_Vout *SDL_Vout_CreateInternal(size_t opaque_size)
         free(vout);
         return NULL;
     }
-    memset(vout->opaque, 0, sizeof(vout->opaque));
+    memset(vout->opaque, 0, opaque_size);
 
     vout->mutex = SDL_CreateMutex();
     if (vout->mutex == NULL) {
@@ -76,7 +76,7 @@ inline static SDL_VoutOverlay *SDL_VoutOverlay_CreateInternal(size_t opaque_size
         free(overlay);
         return NULL;
     }
-    memset(overlay->opaque, 0, sizeof(overlay->opaque));
+    memset(overlay->opaque, 0, opaque_size);
     return overlay;
 }
 
@@ -92,4 +92,6 @@ inline static void SDL_VoutOverlay_FreeInternal(SDL_VoutOverlay *overlay)
     free(overlay);
 }
 
+#define SDLTRACE ALOGW
+
 #endif

ijkmediaplayer/jni/ijksdl/ijksdl_vout_overlay_ffmpeg.c

@@ -62,6 +62,7 @@ static AVFrame *alloc_avframe(SDL_VoutOverlay_Opaque* opaque, enum AVPixelFormat
 
 static void overlay_free_l(SDL_VoutOverlay *overlay)
 {
+    ALOGE("SDL_Overlay(ffmpeg): overlay_free_l(%p)", overlay);
     if (!overlay)
         return;
 
@@ -109,9 +110,13 @@ static int overlay_unlock(SDL_VoutOverlay *overlay)
 
 SDL_VoutOverlay *SDL_VoutCreateFFmpegYUVOverlay(int width, int height, Uint32 format, SDL_Vout *display)
 {
+    SDLTRACE("SDL_VoutCreateFFmpegYUVOverlay(w=%d, h=%d, fmt=%.4s(0x%x, dp=%p)",
+        width, height, (const char*) &format, format, display);
     SDL_VoutOverlay *overlay = SDL_VoutOverlay_CreateInternal(sizeof(SDL_VoutOverlay_Opaque));
-    if (!overlay)
+    if (!overlay) {
+        ALOGE("SDL_VoutCreateFFmpegYUVOverlay(...)=NULL");
         return NULL;
+    }
 
     overlay->format = format;
 
@@ -123,17 +128,21 @@ SDL_VoutOverlay *SDL_VoutCreateFFmpegYUVOverlay(int width, int height, Uint32 fo
     AVPicture *pic = NULL;
     switch (format) {
     case SDL_YV12_OVERLAY:
+        SDLTRACE("SDL_VoutCreateFFmpegYUVOverlay(...): SDL_YV12_OVERLAY (swap UV)");
         frame = alloc_avframe(opaque, AV_PIX_FMT_YUV420P, width, height);
-        overlay_fill(overlay, frame, format, 3);
-        /* swap U,V */
-        pic = (AVPicture *) frame;
-        overlay->pixels[2] = pic->data[1];
-        overlay->pixels[1] = pic->data[2];
-
-        overlay->pitches[2] = pic->linesize[1];
-        overlay->pitches[1] = pic->linesize[2];
+        if (frame) {
+            overlay_fill(overlay, frame, format, 3);
+            /* swap U,V */
+            pic = (AVPicture *) frame;
+            overlay->pixels[2] = pic->data[1];
+            overlay->pixels[1] = pic->data[2];
+
+            overlay->pitches[2] = pic->linesize[1];
+            overlay->pitches[1] = pic->linesize[2];
+        }
         break;
     default:
+        ALOGE("SDL_VoutCreateFFmpegYUVOverlay(...): unknown format");
         break;
     }
 
@@ -148,5 +157,6 @@ SDL_VoutOverlay *SDL_VoutCreateFFmpegYUVOverlay(int width, int height, Uint32 fo
         overlay = NULL;
     }
 
+    SDLTRACE("SDL_VoutCreateFFmpegYUVOverlay(...)=%p", overlay);
     return overlay;
 }