demux: ts: remove pid array

[vlc] / include / vlc_codec.h

diff --git a/include/vlc_codec.h b/include/vlc_codec.h
index 0237aa4447fed2f8eae051a766d34c916e68587d..8f331652e3e6a68748616ac99a6d9fc759dd33fa 100644 (file)
--- a/include/vlc_codec.h
+++ b/include/vlc_codec.h
@@ -71,7 +71,7 @@ struct decoder_t
 
     /* */
     picture_t *         ( * pf_decode_video )( decoder_t *, block_t ** );
-    aout_buffer_t *     ( * pf_decode_audio )( decoder_t *, block_t ** );
+    block_t *           ( * pf_decode_audio )( decoder_t *, block_t ** );
     subpicture_t *      ( * pf_decode_sub)   ( decoder_t *, block_t ** );
     block_t *           ( * pf_packetize )   ( decoder_t *, block_t ** );
 
@@ -95,21 +95,22 @@ struct decoder_t
      */
 
     /* Video output callbacks
-     * XXX use decoder_NewPicture/decoder_DeletePicture
-     * and decoder_LinkPicture/decoder_UnlinkPicture */
+     * XXX use decoder_NewPicture */
+    int             (*pf_vout_format_update)( decoder_t * );
     picture_t      *(*pf_vout_buffer_new)( decoder_t * );
-    void            (*pf_vout_buffer_del)( decoder_t *, picture_t * );
-    void            (*pf_picture_link)   ( decoder_t *, picture_t * );
-    void            (*pf_picture_unlink) ( decoder_t *, picture_t * );
 
-    /* Audio output callbacks
-     * XXX use decoder_NewAudioBuffer/decoder_DeleteAudioBuffer */
-    aout_buffer_t  *(*pf_aout_buffer_new)( decoder_t *, int );
+    /**
+     * Number of extra (ie in addition to the DPB) picture buffers
+     * needed for decoding.
+     */
+    int             i_extra_picture_buffers;
+
+    /* Audio output callbacks */
+    int             (*pf_aout_format_update)( decoder_t * );
 
     /* SPU output callbacks
-     * XXX use decoder_NewSubpicture and decoder_DeleteSubpicture */
+     * XXX use decoder_NewSubpicture */
     subpicture_t   *(*pf_spu_buffer_new)( decoder_t *, const subpicture_updater_t * );
-    void            (*pf_spu_buffer_del)( decoder_t *, subpicture_t * );
 
     /* Input attachments
      * XXX use decoder_GetInputAttachments */
@@ -156,7 +157,7 @@ struct encoder_t
     es_format_t         fmt_out;
 
     block_t *           ( * pf_encode_video )( encoder_t *, picture_t * );
-    block_t *           ( * pf_encode_audio )( encoder_t *, aout_buffer_t * );
+    block_t *           ( * pf_encode_audio )( encoder_t *, block_t * );
     block_t *           ( * pf_encode_sub )( encoder_t *, subpicture_t * );
 
     /* Common encoder options */
@@ -174,49 +175,53 @@ struct encoder_t
  */
 
 
+/**
+ * This function notifies the video output pipeline of a new video output
+ * format (fmt_out.video). If there is currently no video output or if the
+ * video output format has changed, a new audio video will be set up.
+ * @return 0 if the video output is working, -1 if not. */
+static inline int decoder_UpdateVideoFormat( decoder_t *dec )
+{
+    if( dec->pf_vout_format_update != NULL )
+        return dec->pf_vout_format_update( dec );
+    else
+        return -1;
+}
+
 /**
  * This function will return a new picture usable by a decoder as an output
- * buffer. You have to release it using decoder_DeletePicture or by returning
+ * buffer. You have to release it using picture_Release() or by returning
  * it to the caller as a pf_decode_video return value.
  */
 VLC_API picture_t * decoder_NewPicture( decoder_t * ) VLC_USED;
 
 /**
- * This function will release a picture create by decoder_NewPicture.
- */
-VLC_API void decoder_DeletePicture( decoder_t *, picture_t *p_picture );
-
-/**
- * This function will increase the picture reference count.
- * (picture_Hold is not usable.)
- */
-VLC_API void decoder_LinkPicture( decoder_t *, picture_t * );
-
-/**
- * This function will decrease the picture reference count.
- * (picture_Release is not usable.)
- */
-VLC_API void decoder_UnlinkPicture( decoder_t *, picture_t * );
+ * This function notifies the audio output pipeline of a new audio output
+ * format (fmt_out.audio). If there is currently no audio output or if the
+ * audio output format has changed, a new audio output will be set up.
+ * @return 0 if the audio output is working, -1 if not. */
+static inline int decoder_UpdateAudioFormat( decoder_t *dec )
+{
+    if( dec->pf_aout_format_update != NULL )
+        return dec->pf_aout_format_update( dec );
+    else
+        return -1;
+}
 
 /**
  * This function will return a new audio buffer usable by a decoder as an
- * output buffer. You have to release it using decoder_DeleteAudioBuffer
- * or by returning it to the caller as a pf_decode_audio return value.
+ * output buffer. It must be released with block_Release() or returned it to
+ * the caller as a pf_decode_audio return value.
  */
-VLC_API aout_buffer_t * decoder_NewAudioBuffer( decoder_t *, int i_size ) VLC_USED;
+VLC_API block_t * decoder_NewAudioBuffer( decoder_t *, int i_size ) VLC_USED;
 
 /**
  * This function will return a new subpicture usable by a decoder as an output
- * buffer. You have to release it using decoder_DeleteSubpicture or by returning
+ * buffer. You have to release it using subpicture_Delete() or by returning
  * it to the caller as a pf_decode_sub return value.
  */
 VLC_API subpicture_t * decoder_NewSubpicture( decoder_t *, const subpicture_updater_t * ) VLC_USED;
 
-/**
- * This function will release a subpicture created by decoder_NewSubicture.
- */
-VLC_API void decoder_DeleteSubpicture( decoder_t *, subpicture_t *p_subpicture );
-
 /**
  * This function gives all input attachments at once.
  *