Qt: CaptureOpenPanel: check and prefill with usual devices

[vlc] / modules / packetizer / packetizer_helper.h

diff --git a/modules/packetizer/packetizer_helper.h b/modules/packetizer/packetizer_helper.h
index 1128a4dc0d52a67bcd0841858eb432e592beb7e4..b46b4657fcfb1fe16f15aaf4f861bffaa375b5cb 100644 (file)
--- a/modules/packetizer/packetizer_helper.h
+++ b/modules/packetizer/packetizer_helper.h
@@ -41,6 +41,7 @@ typedef struct
     int i_state;
     block_bytestream_t bytestream;
     size_t i_offset;
+    bool   b_flushing;
 
     int i_startcode;
     const uint8_t *p_startcode;
@@ -48,6 +49,8 @@ typedef struct
     int i_au_prepend;
     const uint8_t *p_au_prepend;
 
+    unsigned i_au_min_size;
+
     void *p_private;
     packetizer_reset_t    pf_reset;
     packetizer_parse_t    pf_parse;
@@ -58,6 +61,7 @@ typedef struct
 static inline void packetizer_Init( packetizer_t *p_pack,
                                     const uint8_t *p_startcode, int i_startcode,
                                     const uint8_t *p_au_prepend, int i_au_prepend,
+                                    unsigned i_au_min_size,
                                     packetizer_reset_t pf_reset,
                                     packetizer_parse_t pf_parse,
                                     packetizer_validate_t pf_validate,
@@ -66,9 +70,11 @@ static inline void packetizer_Init( packetizer_t *p_pack,
     p_pack->i_state = STATE_NOSYNC;
     p_pack->bytestream = block_BytestreamInit();
     p_pack->i_offset = 0;
+    p_pack->b_flushing = false;
 
     p_pack->i_au_prepend = i_au_prepend;
     p_pack->p_au_prepend = p_au_prepend;
+    p_pack->i_au_min_size = i_au_min_size;
 
     p_pack->i_startcode = i_startcode;
     p_pack->p_startcode = p_startcode;
@@ -134,7 +140,19 @@ static inline block_t *packetizer_Packetize( packetizer_t *p_pack, block_t **pp_
             /* Find the next startcode */
             if( block_FindStartcodeFromOffset( &p_pack->bytestream, &p_pack->i_offset,
                                                p_pack->p_startcode, p_pack->i_startcode ) )
-                return NULL; /* Need more data */
+            {
+                if( !p_pack->b_flushing || !p_pack->bytestream.p_chain )
+                    return NULL; /* Need more data */
+
+                /* When flusing and we don't find a startcode, suppose that
+                 * the data extend up to the end */
+                block_ChainProperties( p_pack->bytestream.p_chain,
+                                       NULL, &p_pack->i_offset, NULL );
+                p_pack->i_offset -= p_pack->bytestream .i_offset;
+
+                if( p_pack->i_offset <= (size_t)p_pack->i_startcode )
+                    return NULL;
+            }
 
             block_BytestreamFlush( &p_pack->bytestream );
 
@@ -153,11 +171,19 @@ static inline block_t *packetizer_Packetize( packetizer_t *p_pack, block_t **pp_
             p_pack->i_offset = 0;
 
             /* Parse the NAL */
-            p_pic = p_pack->pf_parse( p_pack->p_private, &b_used_ts, p_pic );
-            if( b_used_ts )
+            if( p_pic->i_buffer < p_pack->i_au_min_size )
             {
-                p_block_bytestream->i_dts = -1;
-                p_block_bytestream->i_pts = -1;
+                block_Release( p_pic );
+                p_pic = NULL;
+            }
+            else
+            {
+                p_pic = p_pack->pf_parse( p_pack->p_private, &b_used_ts, p_pic );
+                if( b_used_ts )
+                {
+                    p_block_bytestream->i_dts = VLC_TS_INVALID;
+                    p_block_bytestream->i_pts = VLC_TS_INVALID;
+                }
             }
 
             if( !p_pic )
@@ -191,9 +217,16 @@ static inline void packetizer_Header( packetizer_t *p_pack,
 
     memcpy( p_init->p_buffer, p_header, i_header );
 
+    p_pack->b_flushing = true;
+
     block_t *p_pic;
     while( ( p_pic = packetizer_Packetize( p_pack, &p_init ) ) )
         block_Release( p_pic ); /* Should not happen (only sequence header) */
+
+    p_pack->i_state = STATE_NOSYNC;
+    block_BytestreamEmpty( &p_pack->bytestream );
+    p_pack->i_offset = 0;
+    p_pack->b_flushing = false;
 }
 
 #endif