Mercurial > mplayer.hg

changeset 34496:1c7446e6c426

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
vd theora: cosmetics: K&R style, alignment Additionally one INFO level output message was slightly changed. patch by Giorgio Vazzana, mywing81 gmail com
author al
date Sat, 21 Jan 2012 17:43:06 +0000
parents a5f7e1b5b0ce
children 75caabde2a65
files libmpcodecs/vd_theora.c
diffstat 1 files changed, 66 insertions(+), 68 deletions(-) [+]
line wrap: on
line diff
--- a/libmpcodecs/vd_theora.c	Sat Jan 21 16:55:37 2012 +0000
+++ b/libmpcodecs/vd_theora.c	Sat Jan 21 17:43:06 2012 +0000
@@ -30,11 +30,11 @@
 #include "libavutil/intreadwrite.h"
 
 static const vd_info_t info = {
-   "Theora/VP3",
-   "theora",
-   "David Kuehling",
-   "www.theora.org",
-   "Theora project's VP3 codec"
+    "Theora/VP3",
+    "theora",
+    "David Kuehling",
+    "www.theora.org",
+    "Theora project's VP3 codec"
 };
 
 LIBVD_EXTERN(theora)
@@ -44,31 +44,33 @@
 #define THEORA_NUM_HEADER_PACKETS 3
 
 typedef struct theora_struct_st {
-    th_setup_info *tsi;
-    th_dec_ctx    *tctx;
-    th_comment     tc;
-    th_info        ti;
+    th_setup_info  *tsi;
+    th_dec_ctx     *tctx;
+    th_comment      tc;
+    th_info         ti;
     th_ycbcr_buffer ycbcrbuf;
 } theora_struct_t;
 
 /** Convert Theora pixelformat to the corresponding IMGFMT_ */
-static uint32_t theora_pixelformat2imgfmt(th_pixel_fmt fmt){
-    switch(fmt) {
-       case TH_PF_420: return IMGFMT_YV12;
-       case TH_PF_422: return IMGFMT_422P;
-       case TH_PF_444: return IMGFMT_444P;
+static uint32_t theora_pixelformat2imgfmt(th_pixel_fmt fmt)
+{
+    switch (fmt) {
+    case TH_PF_420: return IMGFMT_YV12;
+    case TH_PF_422: return IMGFMT_422P;
+    case TH_PF_444: return IMGFMT_444P;
     }
     return 0;
 }
 
 // to set/get/query special features/parameters
-static int control(sh_video_t *sh,int cmd,void* arg,...){
+static int control(sh_video_t *sh, int cmd, void *arg, ...)
+{
     theora_struct_t *context = sh->context;
-    switch(cmd) {
+    switch (cmd) {
     case VDCTRL_QUERY_FORMAT:
-        if (*(int*)arg == theora_pixelformat2imgfmt(context->ti.pixel_fmt))
-	    return CONTROL_TRUE;
-	return CONTROL_FALSE;
+        if (*(int *)arg == theora_pixelformat2imgfmt(context->ti.pixel_fmt))
+            return CONTROL_TRUE;
+        return CONTROL_FALSE;
     }
 
     return CONTROL_UNKNOWN;
@@ -77,15 +79,16 @@
 /*
  * init driver
  */
-static int init(sh_video_t *sh){
+static int init(sh_video_t *sh)
+{
     theora_struct_t *context = NULL;
-    uint8_t *extradata = (uint8_t *)(sh->bih + 1);
-    int extradata_size = sh->bih->biSize - sizeof(*sh->bih);
-    int errorCode = 0;
+    uint8_t *extradata       = (uint8_t *)(sh->bih + 1);
+    int      extradata_size  = sh->bih->biSize - sizeof(*sh->bih);
+    int      errorCode       = 0;
     ogg_packet op;
     int i;
 
-    context = calloc (sizeof (theora_struct_t), 1);
+    context     = calloc(sizeof(theora_struct_t), 1);
     sh->context = context;
     if (!context)
         goto err_out;
@@ -95,8 +98,7 @@
     context->tsi = NULL;
 
     /* Read all header packets, pass them to theora_decode_header. */
-    for (i = 0; i < THEORA_NUM_HEADER_PACKETS; i++)
-    {
+    for (i = 0; i < THEORA_NUM_HEADER_PACKETS; i++) {
         if (extradata_size > 2) {
             op.bytes  = AV_RB16(extradata);
             op.packet = extradata + 2;
@@ -108,37 +110,34 @@
             extradata      += op.bytes + 2;
             extradata_size -= op.bytes + 2;
         } else {
-            op.bytes = ds_get_packet (sh->ds, &op.packet);
+            op.bytes = ds_get_packet(sh->ds, &op.packet);
             op.b_o_s = 1;
         }
 
-        if ( (errorCode = th_decode_headerin (&context->ti, &context->tc, &context->tsi, &op)) < 0)
-        {
+        if ((errorCode = th_decode_headerin(&context->ti, &context->tc, &context->tsi, &op)) < 0) {
             mp_msg(MSGT_DECVIDEO, MSGL_ERR, "Broken Theora header; errorCode=%i!\n", errorCode);
             goto err_out;
         }
     }
 
     /* now init codec */
-    context->tctx = th_decode_alloc (&context->ti, context->tsi);
-    if (!context->tctx)
-    {
-        mp_msg(MSGT_DECVIDEO,MSGL_ERR,"Theora decode init failed\n");
+    context->tctx = th_decode_alloc(&context->ti, context->tsi);
+    if (!context->tctx) {
+        mp_msg(MSGT_DECVIDEO, MSGL_ERR, "Theora decode init failed\n");
         goto err_out;
     }
     /* free memory used for decoder setup information */
     th_setup_free(context->tsi);
 
-    if(sh->aspect==0.0 && context->ti.aspect_denominator!=0)
-    {
-       sh->aspect = ((double)context->ti.aspect_numerator * context->ti.frame_width)/
-          ((double)context->ti.aspect_denominator * context->ti.frame_height);
+    if (sh->aspect == 0.0 && context->ti.aspect_denominator != 0) {
+        sh->aspect = ((double)context->ti.aspect_numerator * context->ti.frame_width) /
+                     ((double)context->ti.aspect_denominator * context->ti.frame_height);
     }
 
-    mp_msg(MSGT_DECVIDEO,MSGL_V,"INFO: Theora video init ok!\n");
-    mp_msg(MSGT_DECVIDEO,MSGL_INFO,"Frame: %dx%d, Picture %dx%d, Offset [%d,%d]\n", context->ti.frame_width, context->ti.frame_height, context->ti.pic_width, context->ti.pic_height, context->ti.pic_x, context->ti.pic_y);
+    mp_msg(MSGT_DECVIDEO, MSGL_V, "INFO: Theora video init ok!\n");
+    mp_msg(MSGT_DECVIDEO, MSGL_INFO, "Frame %dx%d, Picture %dx%d, Offset [%d,%d]\n", context->ti.frame_width, context->ti.frame_height, context->ti.pic_width, context->ti.pic_height, context->ti.pic_x, context->ti.pic_y);
 
-    return mpcodecs_config_vo (sh,context->ti.frame_width,context->ti.frame_height,theora_pixelformat2imgfmt(context->ti.pixel_fmt));
+    return mpcodecs_config_vo(sh, context->ti.frame_width, context->ti.frame_height, theora_pixelformat2imgfmt(context->ti.pixel_fmt));
 
 err_out:
     free(context);
@@ -151,43 +150,41 @@
  */
 static void uninit(sh_video_t *sh)
 {
-   theora_struct_t *context = sh->context;
+    theora_struct_t *context = sh->context;
 
-   if (context)
-   {
-      th_info_clear(&context->ti);
-      th_comment_clear(&context->tc);
-      th_decode_free (context->tctx);
-      free (context);
-   }
+    if (context) {
+        th_info_clear(&context->ti);
+        th_comment_clear(&context->tc);
+        th_decode_free(context->tctx);
+        free(context);
+    }
 }
 
 /*
  * decode frame
  */
-static mp_image_t* decode(sh_video_t *sh,void* data,int len,int flags)
+static mp_image_t *decode(sh_video_t *sh, void *data, int len, int flags)
 {
-   theora_struct_t *context = sh->context;
-   int errorCode = 0;
-   ogg_packet op;
-   mp_image_t* mpi;
+    theora_struct_t *context = sh->context;
+    int errorCode = 0;
+    ogg_packet op;
+    mp_image_t *mpi;
 
-   // no delayed frames
-   if (!data || !len)
-       return NULL;
+    // no delayed frames
+    if (!data || !len)
+        return NULL;
 
-   memset (&op, 0, sizeof (op));
-   op.bytes = len;
-   op.packet = data;
-   op.granulepos = -1;
+    memset(&op, 0, sizeof(op));
+    op.bytes      = len;
+    op.packet     = data;
+    op.granulepos = -1;
 
-   errorCode = th_decode_packetin (context->tctx, &op, NULL);
-   if (errorCode < 0)
-   {
-      mp_msg(MSGT_DECVIDEO,MSGL_ERR,"Theora decode packetin failed: %i \n",
-	     errorCode);
-      return NULL;
-   }
+    errorCode = th_decode_packetin(context->tctx, &op, NULL);
+    if (errorCode < 0) {
+        mp_msg(MSGT_DECVIDEO, MSGL_ERR, "Theora decode packetin failed: %i \n",
+               errorCode);
+        return NULL;
+    }
 
     if (errorCode != TH_DUPFRAME) {
         errorCode = th_decode_ycbcr_out(context->tctx, context->ycbcrbuf);
@@ -201,7 +198,8 @@
     mpi = mpcodecs_get_image(sh, MP_IMGTYPE_EXPORT, 0,
                              context->ycbcrbuf[0].width,
                              context->ycbcrbuf[0].height);
-    if(!mpi) return NULL;
+    if (!mpi)
+        return NULL;
 
     mpi->planes[0] = context->ycbcrbuf[0].data;
     mpi->stride[0] = context->ycbcrbuf[0].stride;