ijksdl: rename RGB fourcc

ijkmediaplayer/jni/ijkplayer/ff_ffplay_def.h

@@ -464,8 +464,8 @@ inline static void ffp_reset_internal(FFPlayer *ffp)
     ffp->sar_den                = 0;
 
     // ffp->overlay_format         = SDL_FCC_YV12;
-    ffp->overlay_format         = SDL_FCC_RGBP;
-    // ffp->overlay_format         = SDL_FCC_RGB4;
+    ffp->overlay_format         = SDL_FCC_RV16;
+    // ffp->overlay_format         = SDL_FCC_RV32;
 
     ffp->last_error             = 0;
     ffp->prepared               = 0;

ijkmediaplayer/jni/ijksdl/android/android_nativewindow.c

@@ -94,7 +94,7 @@ static int android_render_on_yv12(ANativeWindow_Buffer *out_buffer, const SDL_Vo
 static int android_render_rgb_on_rgb(ANativeWindow_Buffer *out_buffer, const SDL_VoutOverlay *overlay, int bpp)
 {
     // SDLTRACE("SDL_VoutAndroid: android_render_rgb_on_rgb(%p)", overlay);
-    assert(overlay->format == SDL_FCC_RGBP);
+    assert(overlay->format == SDL_FCC_RV16);
     assert(overlay->planes == 1);
 
     int min_height = IJKMIN(out_buffer->height, overlay->h);
@@ -131,7 +131,7 @@ static int android_render_on_rgb565(ANativeWindow_Buffer *out_buffer, const SDL_
     assert(overlay);
 
     switch (overlay->format) {
-    case SDL_FCC_RGBP: {
+    case SDL_FCC_RV16: {
         return android_render_rgb565_on_rgb565(out_buffer, overlay);
     }
     }
@@ -150,7 +150,7 @@ static int android_render_on_rgb8888(ANativeWindow_Buffer *out_buffer, const SDL
     assert(overlay);
 
     switch (overlay->format) {
-    case SDL_FCC_RGB4: {
+    case SDL_FCC_RV32: {
         return android_render_rgb32_on_rgb8888(out_buffer, overlay);
     }
     }
@@ -174,15 +174,13 @@ static AndroidHalFourccDescriptor g_hal_fcc_map[] = {
 
     // RGB565
     { HAL_PIXEL_FORMAT_RGB_565, "HAL_RGB_565", HAL_PIXEL_FORMAT_RGB_565, android_render_on_rgb565 },
-    { SDL_FCC_RGBP, "RGBP", HAL_PIXEL_FORMAT_RGB_565, android_render_on_rgb565 },
-    { SDL_FCC_BGRP, "BGRP", HAL_PIXEL_FORMAT_RGB_565, android_render_on_rgb565 },
+    { SDL_FCC_RV16, "RV16", HAL_PIXEL_FORMAT_RGB_565, android_render_on_rgb565 },
 
     // RGB8888
     { HAL_PIXEL_FORMAT_RGBX_8888, "HAL_RGBX_8888", HAL_PIXEL_FORMAT_RGBX_8888, android_render_on_rgb8888 },
     { HAL_PIXEL_FORMAT_RGBA_8888, "HAL_RGBA_8888", HAL_PIXEL_FORMAT_RGBA_8888, android_render_on_rgb8888 },
     { HAL_PIXEL_FORMAT_BGRA_8888, "HAL_BGRA_8888", HAL_PIXEL_FORMAT_BGRA_8888, android_render_on_rgb8888 },
-    { SDL_FCC_RGB4, "RGB4", HAL_PIXEL_FORMAT_RGBX_8888, android_render_on_rgb8888 },
-    { SDL_FCC_BGR4, "BGR4", HAL_PIXEL_FORMAT_RGBX_8888, android_render_on_rgb8888 },
+    { SDL_FCC_RV32, "RV32", HAL_PIXEL_FORMAT_RGBX_8888, android_render_on_rgb8888 },
 };
 
 AndroidHalFourccDescriptor *native_window_get_desc(int fourcc_or_hal)

ijkmediaplayer/jni/ijksdl/ffmpeg/ijksdl_vout_overlay_ffmpeg.c

@@ -134,14 +134,14 @@ SDL_VoutOverlay *SDL_VoutFFmpeg_CreateOverlay(int width, int height, Uint32 form
         }
         break;
     }
-    case SDL_FCC_RGBP: {
+    case SDL_FCC_RV16: {
         opaque->frame = alloc_avframe(opaque, AV_PIX_FMT_RGB565, width, height);
         if (opaque->frame) {
             overlay_fill(overlay, opaque->frame, format, 1);
         }
         break;
     }
-    case SDL_FCC_RGB4: {
+    case SDL_FCC_RV32: {
         opaque->frame = alloc_avframe(opaque, AV_PIX_FMT_RGB32, width, height);
         if (opaque->frame) {
             overlay_fill(overlay, opaque->frame, format, 1);
@@ -174,9 +174,9 @@ enum AVPixelFormat SDL_VoutFFmpeg_GetBestAVPixelFormat(Uint32 format)
     switch (format) {
     case SDL_FCC_YV12:
         return AV_PIX_FMT_YUV420P;
-    case SDL_FCC_RGB4:
+    case SDL_FCC_RV32:
         return AV_PIX_FMT_0BGR32;
-    case SDL_FCC_RGBP:
+    case SDL_FCC_RV16:
         return AV_PIX_FMT_RGB565;
     default:
         return AV_PIX_FMT_NONE;
@@ -209,7 +209,7 @@ int SDL_VoutFFmpeg_SetupPicture(const SDL_VoutOverlay *overlay, AVPicture *pic,
         case AV_PIX_FMT_0RGB32:
         {
         switch (overlay->format) {
-        case SDL_FCC_RGB4: {
+        case SDL_FCC_RV32: {
             for (int i = 0; i < overlay->planes; ++i) {
                 pic->data[i] = overlay->pixels[i];
                 pic->linesize[i] = overlay->pitches[i];
@@ -223,7 +223,7 @@ int SDL_VoutFFmpeg_SetupPicture(const SDL_VoutOverlay *overlay, AVPicture *pic,
     case AV_PIX_FMT_BGR565:
         case AV_PIX_FMT_RGB565: {
         switch (overlay->format) {
-        case SDL_FCC_RGBP: {
+        case SDL_FCC_RV16: {
             for (int i = 0; i < overlay->planes; ++i) {
                 pic->data[i] = overlay->pixels[i];
                 pic->linesize[i] = overlay->pitches[i];

ijkmediaplayer/jni/ijksdl/ijksdl_fourcc.h

@@ -67,10 +67,8 @@
 #define SDL_FCC_YVYU    SDL_FOURCC('Y', 'V', 'Y', 'U')  /**< bpp=16, Packed mode: Y0+V0+Y1+U0 (1 plane) */
 
 // RGB formats
-#define SDL_FCC_RGBP    SDL_FOURCC('R', 'G', 'B', 'P')    /**< RGB565, AV_PIX_FMT_RGB565 */
-#define SDL_FCC_BGRP    SDL_FOURCC('B', 'G', 'R', 'P')    /**< RGB565, AV_PIX_FMT_BGR565 */
-#define SDL_FCC_RGB4    SDL_FOURCC('R', 'G', 'B', '4')    /**< RGB8888, AV_PIX_FMT_RGB32 */
-#define SDL_FCC_BGR4    SDL_FOURCC('B', 'G', 'R', '4')    /**< RGB8888, AV_PIX_FMT_BGR32 */
+#define SDL_FCC_RV16    SDL_FOURCC('R', 'V', '1', '6')    /**< bpp=16, RGB565 */
+#define SDL_FCC_RV32    SDL_FOURCC('R', 'V', '3', '2')    /**< bpp=24, RGBX8888 */
 
 // undefine
 #define SDL_FCC_UNDF    SDL_FOURCC('U', 'N', 'D', 'F')    /**< undefined */