X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fcodec%2Fmash.cpp;h=86245790fae8a825ba15199775934d749bf7841e;hb=73339d95a75f7f9311d4aa8674ee2600f884d8d7;hp=74e63f885a843cba4f65a1e7d3d70aa58ee96828;hpb=5b55ee1bb0a0212b967f8f4a33824ffc6b7c7f09;p=vlc

diff --git a/modules/codec/mash.cpp b/modules/codec/mash.cpp
index 74e63f885a..86245790fa 100644
--- a/modules/codec/mash.cpp
+++ b/modules/codec/mash.cpp
@@ -28,9 +28,9 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
+#include <vlc_plugin.h>
 #include <vlc_codec.h>
-#include <vlc_vout.h>
 #include <vlc_block.h>
 
 #include <p64/p64.h>
@@ -66,13 +66,13 @@ static block_t   *SendFrame  ( decoder_t *, block_t * );
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/
-vlc_module_begin();
-    set_description( _("Video decoder using openmash") );
-    set_capability( "decoder", 50 );
-    set_category( CAT_INPUT );
-    set_subcategory( SUBCAT_INPUT_VCODEC );
-    set_callbacks( OpenDecoder, CloseDecoder );
-vlc_module_end();
+vlc_module_begin ()
+    set_description( N_("Video decoder using openmash") )
+    set_capability( "decoder", 50 )
+    set_category( CAT_INPUT )
+    set_subcategory( SUBCAT_INPUT_VCODEC )
+    set_callbacks( OpenDecoder, CloseDecoder )
+vlc_module_end ()
 
 /*****************************************************************************
  * OpenDecoder: probe the decoder and return score
@@ -85,8 +85,7 @@ static int OpenDecoder( vlc_object_t *p_this )
     switch( p_dec->fmt_in.i_codec )
     {
         /* Planar YUV */
-        case VLC_FOURCC('h','2','6','1'):
-        case VLC_FOURCC('H','2','6','1'):
+        case VLC_CODEC_H261:
             break;
 
         default:
@@ -96,18 +95,15 @@ static int OpenDecoder( vlc_object_t *p_this )
     /* Allocate the memory needed to store the decoder's structure */
     if( ( p_dec->p_sys = p_sys =
           (decoder_sys_t *)malloc(sizeof(decoder_sys_t)) ) == NULL )
-    {
-        msg_Err( p_dec, "out of memory" );
-        return VLC_EGENERIC;
-    }
+        return VLC_ENOMEM;
     /* Misc init */
-    p_sys->i_pts = 0;
+    p_sys->i_pts = VLC_TS_INVALID;
     p_sys->b_inited = false;
     p_sys->i_counter = 0;
 
     /* Set output properties */
     p_dec->fmt_out.i_cat = VIDEO_ES;
-    p_dec->fmt_out.i_codec = VLC_FOURCC('I','4','2','0');
+    p_dec->fmt_out.i_codec = VLC_CODEC_I420;
 
     /* Set callbacks */
     p_dec->pf_decode_video = (picture_t *(*)(decoder_t *, block_t **))
@@ -147,7 +143,8 @@ static void *DecodeBlock( decoder_t *p_dec, block_t **pp_block )
 
     p_block = *pp_block;
 
-    if( !p_sys->i_pts && !p_block->i_pts && !p_block->i_dts )
+    if( p_sys->i_pts <= VLC_TS_INVALID && p_block->i_pts <= VLC_TS_INVALID &&
+        p_block->i_dts <= VLC_TS_INVALID )
     {
         /* We've just started the stream, wait for the first PTS. */
         block_Release( p_block );
@@ -156,11 +153,10 @@ static void *DecodeBlock( decoder_t *p_dec, block_t **pp_block )
 
 
     /* Date management */
-    if( p_block->i_pts > 0 || p_block->i_dts > 0 )
-    {
-        if( p_block->i_pts > 0 ) p_sys->i_pts = p_block->i_pts;
-        else if( p_block->i_dts > 0 ) p_sys->i_pts = p_block->i_dts;
-    }
+    if( p_block->i_pts > VLC_TS_INVALID )
+        p_sys->i_pts = p_block->i_pts;
+    else if( p_block->i_dts > VLC_TS_INVALID )
+        p_sys->i_pts = p_block->i_dts;
 
     i_video_header = *(uint32_t*)p_block->p_buffer; /* yes, it is native endian */
     sbit = i_video_header >> 29; /* start bit position */
@@ -177,7 +173,7 @@ static void *DecodeBlock( decoder_t *p_dec, block_t **pp_block )
     mvdv = i_video_header & 0x1f; /* vertical motion vector data */
     cc = p_block->i_buffer - 4;
     msg_Dbg( p_dec, "packet size %d", cc );
- 
+
     /* Find out p_vdec->i_raw_size */
     p_sys->p_decoder->decode( p_block->p_buffer + 4 /*bp?*/,
                               cc /*cc?*/,
@@ -194,9 +190,9 @@ static void *DecodeBlock( decoder_t *p_dec, block_t **pp_block )
     {
         msg_Dbg( p_dec, "video size is perhaps %dx%d", i_width,
                   i_height);
-        vout_InitFormat( &p_dec->fmt_out.video, VLC_FOURCC('I','4','2','0'),
-                         i_width, i_height,
-                         VOUT_ASPECT_FACTOR * i_width / i_height );
+        video_format_Setup( &p_dec->fmt_out.video, VLC_CODEC_I420,
+                            i_width, i_height,
+                            1, 1 );
         p_sys->b_inited = true;
     }
     p_pic = NULL;
@@ -204,7 +200,7 @@ static void *DecodeBlock( decoder_t *p_dec, block_t **pp_block )
 //    p_sys->p_decoder->sync();
     if( p_block->i_flags & BLOCK_FLAG_END_OF_FRAME )
     {
-        p_pic = p_dec->pf_vout_buffer_new( p_dec );
+        p_pic = decoder_NewPicture( p_dec );
         if( !p_pic )
         {
             block_Release( p_block );