include/vlc_block.h:

 * added a BLOCK_FLAG_END_OF_FRAME flag
 * reformated comments on block flags
modules/demux/livedotcom.cpp
 * use BLOCK_FLAG_END_OF_FRAME, and only for h261 streams
modules/codec/Modules.am,mash.cpp
 * new h261 video decoder using openmash. Building this plugin is left as an
   excersise for the reader.

diff --git a/include/vlc_block.h b/include/vlc_block.h
index 1c6cbb40aa953d6678ecf1a8b4ce0c09b92392b1..8ded716d7f9f63534437ca383ad755811abf24db 100644 (file)
--- a/include/vlc_block.h
+++ b/include/vlc_block.h
@@ -29,18 +29,20 @@
  */
 typedef struct block_sys_t block_sys_t;
 
-/* BLOCK_FLAG_DISCONTINUITY: the content doesn't follow the last block, or is probably broken */
+/** The content doesn't follow the last block, or is probably broken */
 #define BLOCK_FLAG_DISCONTINUITY 0x0001
-/* BLOCK_FLAG_TYPE_I: Intra frame */
+/** Intra frame */
 #define BLOCK_FLAG_TYPE_I        0x0002
-/* BLOCK_FLAG_TYPE_P: inter frame with backward reference only */
+/** Inter frame with backward reference only */
 #define BLOCK_FLAG_TYPE_P        0x0004
-/* BLOCK_FLAG_TYPE_B: inter frame with backward and forward reference */
+/** Inter frame with backward and forward reference */
 #define BLOCK_FLAG_TYPE_B        0x0008
-/* BLOCK_FLAG_TYPE_PB: for inter frame when you don't know the real type */
+/** For inter frame when you don't know the real type */
 #define BLOCK_FLAG_TYPE_PB       0x0010
-/* BLOCK_FLAG_HEADER: warm that this block is a header one */
+/** Warm that this block is a header one */
 #define BLOCK_FLAG_HEADER        0x0020
+/** This is the last block of the frame */
+#define BLOCK_FLAG_END_OF_FRAME  0x0040
 
 #define BLOCK_FLAG_PRIVATE_MASK  0xffff0000
 #define BLOCK_FLAG_PRIVATE_SHIFT 16

diff --git a/modules/codec/Modules.am b/modules/codec/Modules.am
index 297363f985a31f6061a5b22c6f9d9326739955e5..e63110b16b35e852e17acc90ee5573e70e50ebc2 100644 (file)
--- a/modules/codec/Modules.am
+++ b/modules/codec/Modules.am
@@ -17,3 +17,4 @@ SOURCES_quicktime = quicktime.c
 SOURCES_subsdec = subsdec.c
 SOURCES_faad = faad.c
 SOURCES_dvbsub = dvbsub.c
+SOURCES_mash = mash.cpp

diff --git a/modules/codec/mash.cpp b/modules/codec/mash.cpp
new file mode 100644 (file)
index 0000000..ca28b04
--- /dev/null
+++ b/modules/codec/mash.cpp
@@ -0,0 +1,220 @@
+/*****************************************************************************
+ * mash.c: Video decoder using openmash codec implementations
+ *****************************************************************************
+ * Copyright (C) 2004 VideoLAN
+ * $Id$
+ *
+ * Authors: Sigmund Augdal <sigmunau@idi.ntnu.no>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ *****************************************************************************/
+
+/*****************************************************************************
+ * Preamble
+ *****************************************************************************/
+#include <vlc/vlc.h>
+#include <vlc/decoder.h>
+#include <vlc/vout.h>
+
+#include <p64/p64.h>
+
+/*****************************************************************************
+ * decoder_sys_t : video decoder descriptor
+ *****************************************************************************/
+struct decoder_sys_t
+{
+    /*
+     * Common properties
+     */
+    mtime_t i_pts;
+    IntraP64Decoder *p_decoder;
+    vlc_bool_t b_inited;
+    int i_counter;
+
+};
+
+/****************************************************************************
+ * Local prototypes
+ ****************************************************************************/
+static int  OpenDecoder   ( vlc_object_t * );
+static void CloseDecoder  ( vlc_object_t * );
+
+static void *DecodeBlock  ( decoder_t *, block_t ** );
+
+#if 0
+static picture_t *DecodeFrame( decoder_t *, block_t * );
+static block_t   *SendFrame  ( decoder_t *, block_t * );
+#endif
+
+/*****************************************************************************
+ * Module descriptor
+ *****************************************************************************/
+vlc_module_begin();
+    set_description( _("Video decoder using openmash") );
+    set_capability( "decoder", 50 );
+    set_callbacks( OpenDecoder, CloseDecoder );
+vlc_module_end();
+
+/*****************************************************************************
+ * OpenDecoder: probe the decoder and return score
+ *****************************************************************************/
+static int OpenDecoder( vlc_object_t *p_this )
+{
+    decoder_t *p_dec = (decoder_t*)p_this;
+    decoder_sys_t *p_sys;
+
+    switch( p_dec->fmt_in.i_codec )
+    {
+        /* Planar YUV */
+        case VLC_FOURCC('h','2','6','1'):
+        case VLC_FOURCC('H','2','6','1'):
+            break;
+
+        default:
+            return VLC_EGENERIC;
+    }
+
+    /* 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;
+    }
+    /* Misc init */
+    p_sys->i_pts = 0;
+    p_sys->b_inited = VLC_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');
+
+    /* Set callbacks */
+    p_dec->pf_decode_video = (picture_t *(*)(decoder_t *, block_t **))
+        DecodeBlock;
+    p_sys->p_decoder = new IntraP64Decoder();
+//     foo->sync();
+
+    return VLC_SUCCESS;
+}
+
+/*****************************************************************************
+ * CloseDecoder: decoder destruction
+ *****************************************************************************/
+static void CloseDecoder( vlc_object_t *p_this )
+{
+    decoder_t *p_dec = (decoder_t*)p_this;
+    free( p_dec->p_sys );
+}
+
+
+/****************************************************************************
+ * DecodeBlock: the whole thing
+ ****************************************************************************
+ * This function must be fed with complete frames.
+ ****************************************************************************/
+static void *DecodeBlock( decoder_t *p_dec, block_t **pp_block )
+{
+    decoder_sys_t *p_sys = p_dec->p_sys;
+    block_t *p_block;
+    picture_t *p_pic;
+    uint32_t i_video_header;
+    uint8_t *p_frame;
+    int cc, sbit, ebit, mba, gob, quant, mvdh, mvdv;
+    int i_width, i_height;
+
+    if( !pp_block || !*pp_block ) return NULL;
+
+    p_block = *pp_block;
+
+    if( !p_sys->i_pts && !p_block->i_pts && !p_block->i_dts )
+    {
+        /* We've just started the stream, wait for the first PTS. */
+        block_Release( p_block );
+        return NULL;
+    }
+
+
+    /* 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;
+    }
+
+    i_video_header = *(uint32_t*)p_block->p_buffer; /* yes, it is native endian */
+    sbit = i_video_header >> 29; /* start bit position */
+    ebit = (i_video_header >> 26) & 7; /* end bit position */
+    msg_Dbg( p_dec, "sbit, ebit: %d,%d", sbit, ebit );
+    gob = (i_video_header >> 20) & 0xf; /* GOB number */
+    if( gob > 12 )
+    {
+        msg_Warn( p_dec, "invalid gob, buggy vic streamer?");
+    }
+    mba = (i_video_header >> 15) & 0x1f; /* Macroblock address predictor */
+    quant = (i_video_header >> 10) & 0x1f; /* quantizer */
+    mvdh = (i_video_header >> 5) & 0x1f; /* horizontal motion vector data */
+    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?*/,
+                              sbit /*sbit?*/,
+                              ebit /*ebit?*/,
+                              mba /* mba?*/,
+                              gob /* gob?*/,
+                              quant /* quant?*/,
+                              mvdh /* mvdh?*/,
+                              mvdv /* mvdv?*/ );
+    i_width = p_sys->p_decoder->width();
+    i_height = p_sys->p_decoder->height();
+    if( !p_sys->b_inited )
+    {
+        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 );
+        p_sys->b_inited = VLC_TRUE;
+    }
+    p_pic = NULL;
+    p_sys->i_counter++;
+//    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 );
+        if( !p_pic )
+        {
+            block_Release( p_block );
+            return NULL;
+        }
+        p_sys->p_decoder->sync();
+        p_sys->i_counter = 0;
+        p_frame = p_sys->p_decoder->frame();
+        p_dec->p_vlc->pf_memcpy( p_pic->p[0].p_pixels, p_frame, i_width*i_height );
+        p_frame += i_width * i_height;
+        p_dec->p_vlc->pf_memcpy( p_pic->p[1].p_pixels, p_frame, i_width*i_height/4 );
+        p_frame += i_width * i_height/4;
+        p_dec->p_vlc->pf_memcpy( p_pic->p[2].p_pixels, p_frame, i_width*i_height/4 );
+        p_pic->date = p_sys->i_pts;
+    }
+    block_Release( p_block);
+    *pp_block = NULL;
+    return p_pic;
+//    return NULL;
+}

diff --git a/modules/demux/livedotcom.cpp b/modules/demux/livedotcom.cpp
index 4a8584c1ab4cbffddaef975a0699e8409e73fa3f..4a20dd1c27b8505d969afd7b41bb75494158eb31 100644 (file)
--- a/modules/demux/livedotcom.cpp
+++ b/modules/demux/livedotcom.cpp
@@ -958,9 +958,10 @@ static void StreamRead( void *p_private, unsigned int i_size, struct timeval pts
     {
         memcpy( p_block->p_buffer, tk->buffer, i_size );
     }
-    if( tk->rtpSource->curPacketMarkerBit() )
+    if( tk->fmt.i_codec == VLC_FOURCC('h','2','6','1') &&
+        tk->rtpSource->curPacketMarkerBit() )
     {        
-        p_block->i_flags |= BLOCK_FLAG_HEADER;
+        p_block->i_flags |= BLOCK_FLAG_END_OF_FRAME;
     }
     //p_block->i_rate = p_input->stream.control.i_rate;