Changeset 1b88d65cb040ba6a0dbf9eb885d4e7e3fb71daac

Timestamp:

01/09/03 00:06:17 (5 years ago)

Author:

Gildas Bazin <gbazin@videolan.org>

git-committer:

Gildas Bazin <gbazin@videolan.org> 1062367577 +0000

git-parent:

[5dfa0cffd6382f22f6289c762b87198bb0d14a0b]

git-author:

Gildas Bazin <gbazin@videolan.org> 1062367577 +0000

Message:

* modules/access/dshow/*: always try to get the video in I420 chroma if supported.

Implemented a ":size=" and ":chroma=" option.

Files:

• modules/access/dshow/dshow.cpp (modified) (12 diffs)
• modules/access/dshow/filter.cpp (modified) (10 diffs)
• modules/access/dshow/filter.h (modified) (7 diffs)

modules/access/dshow/dshow.cpp

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2002 VideoLAN
-6 2003/08/27 12:59:11
+7 2003/08/31 22:06:17
- *
- * Author: Gildas Bazin <gbazin@netcourrier.com>
@@ -33 +33 @@
-#include <vlc/vout.h>
-
-#ifndef _MSC_VER
-#   include <wtypes.h>
-#   include <unknwn.h>
-#   include <ole2.h>
-#   include <limits.h>
-#   define _WINGDI_ 1
-#   define AM_NOVTABLE
-#   define _OBJBASE_H_
-#   undef _X86_
-#   define _I64_MAX LONG_LONG_MAX
-#   define LONGLONG long long
-#endif
-
-#include <dshow.h>
-
-#include "filter.h"
-
@@ -64 +49 @@
-static IBaseFilter *FindCaptureDevice( vlc_object_t *, string *,
-                                       list<string> *, vlc_bool_t );
-
-
+
+
+
-
-/*****************************************************************************
@@ -174 +160 @@
-    int            i_streams;
-    int            i_current_stream;
+
+    /* misc properties */
+    int            i_width;
+    int            i_height;
+    int            i_chroma;
-};
-
@@ -189 +180 @@
-    psz_parser = psz_dup;
-    string vdevname, adevname;
+    int i_width = 0, i_height = 0, i_chroma = VLC_FOURCC('I','4','2','0');
-
-    while( *psz_parser && *psz_parser != ':' )
@@ -234 +226 @@
-
-                psz_parser += i_len;
+            }
+            else if( !strncmp( psz_parser, "size=", strlen( "size=" ) ) )
+            {
+                psz_parser += strlen( "size=" );
+                if( !strncmp( psz_parser, "subqcif", strlen( "subqcif" ) ) )
+                {
+                    i_width  = 128;
+                    i_height = 96;
+                }
+                else if( !strncmp( psz_parser, "qsif", strlen( "qsif" ) ) )
+                {
+                    i_width  = 160;
+                    i_height = 120;
+                }
+                else if( !strncmp( psz_parser, "qcif", strlen( "qcif" ) ) )
+                {
+                    i_width  = 176;
+                    i_height = 144;
+                }
+                else if( !strncmp( psz_parser, "sif", strlen( "sif" ) ) )
+                {
+                    i_width  = 320;
+                    i_height = 240;
+                }
+                else if( !strncmp( psz_parser, "cif", strlen( "cif" ) ) )
+                {
+                    i_width  = 352;
+                    i_height = 288;
+                }
+                else if( !strncmp( psz_parser, "vga", strlen( "vga" ) ) )
+                {
+                    i_width  = 640;
+                    i_height = 480;
+                }
+                else
+                {
+                    /* widthxheight */
+                    i_width = strtol( psz_parser, &psz_parser, 0 );
+                    if( *psz_parser == 'x' || *psz_parser == 'X')
+                    {
+                        i_height = strtol( psz_parser + 1, &psz_parser, 0 );
+                    }
+                    msg_Dbg( p_input, "WidthxHeight %dx%d", i_width, i_height );
+                }
+            }
+            else if( !strncmp( psz_parser, "chroma=", strlen( "chroma=" ) ) )
+            {
+                psz_parser += strlen( "chroma=" );
+                if( strlen( psz_parser ) >= 4 )
+                {
+                    i_chroma = VLC_FOURCC( psz_parser[0],psz_parser[1],
+                                           psz_parser[2],psz_parser[3] );
+                }
-            }
-            else
@@ -278 +323 @@
-    p_sys->i_streams = 0;
-    p_sys->pp_streams = (dshow_stream_t **)malloc( 1 );
+    p_sys->i_width = i_width;
+    p_sys->i_height = i_height;
+    p_sys->i_chroma = i_chroma;
-
-    /* Create header */
@@ -419 +467 @@
-    }
-
+    AM_MEDIA_TYPE media_type =
+        EnumDeviceCaps( (vlc_object_t *)p_input, p_device_filter, b_audio,
+                        p_sys->i_chroma, p_sys->i_width, p_sys->i_height );
+
-    /* Create and add our capture filter */
-
+, media_type
-    p_sys->p_graph->AddFilter( p_capture_filter, 0 );
-
@@ -442 +494 @@
-            msg_Dbg( p_input, "MEDIATYPE_Video");
-
+            /* Packed RGB formats */
+            if( dshow_stream.mt.subtype == MEDIASUBTYPE_RGB1 )
+                dshow_stream.i_fourcc = VLC_FOURCC( 'R', 'G', 'B', '1' );
+            if( dshow_stream.mt.subtype == MEDIASUBTYPE_RGB4 )
+                dshow_stream.i_fourcc = VLC_FOURCC( 'R', 'G', 'B', '4' );
-            if( dshow_stream.mt.subtype == MEDIASUBTYPE_RGB8 )
-G', 'R', 'E', 'Y
+R', 'G', 'B', '8
-            else if( dshow_stream.mt.subtype == MEDIASUBTYPE_RGB555 )
-                dshow_stream.i_fourcc = VLC_FOURCC( 'R', 'V', '1', '5' );
@@ -454 +511 @@
-            else if( dshow_stream.mt.subtype == MEDIASUBTYPE_ARGB32 )
-                dshow_stream.i_fourcc = VLC_FOURCC( 'R', 'G', 'B', 'A' );
-
+
+
+
+
-            else if( dshow_stream.mt.subtype == MEDIASUBTYPE_YUYV )
-                dshow_stream.i_fourcc = VLC_FOURCC( 'Y', 'U', 'Y', 'V' );
-            else if( dshow_stream.mt.subtype == MEDIASUBTYPE_Y411 )
-                dshow_stream.i_fourcc = VLC_FOURCC( 'I', '4', '1', 'N' );
+            else if( dshow_stream.mt.subtype == MEDIASUBTYPE_Y211 )
+                dshow_stream.i_fourcc = VLC_FOURCC( 'Y', '2', '1', '1' );
+            else if( dshow_stream.mt.subtype == MEDIASUBTYPE_YUY2 ||
+                     dshow_stream.mt.subtype == MEDIASUBTYPE_UYVY )
+                dshow_stream.i_fourcc = VLC_FOURCC( 'Y', 'U', 'Y', '2' );
+
+            /* Planar YUV formats */
+            else if( dshow_stream.mt.subtype == MEDIASUBTYPE_I420 )
+                dshow_stream.i_fourcc = VLC_FOURCC( 'I', '4', '2', '0' );
-            else if( dshow_stream.mt.subtype == MEDIASUBTYPE_Y41P )
-                dshow_stream.i_fourcc = VLC_FOURCC( 'I', '4', '1', '1' );
-
-
-
-
-
-
-
+
+
-                dshow_stream.i_fourcc = VLC_FOURCC( 'Y', 'V', '1', '2' );
+            else if( dshow_stream.mt.subtype == MEDIASUBTYPE_YVU9 )
+                dshow_stream.i_fourcc = VLC_FOURCC( 'Y', 'V', 'U', '9' );
+
-            else goto fail;
-
@@ -477 +544 @@
-
-            /* Check if the image is inverted (bottom to top) */
-
+
+
+
+
-                dshow_stream.i_fourcc == VLC_FOURCC( 'R', 'V', '1', '6' ) ||
-                dshow_stream.i_fourcc == VLC_FOURCC( 'R', 'V', '2', '4' ) ||
@@ -662 +732 @@
-}
-
+static AM_MEDIA_TYPE EnumDeviceCaps( vlc_object_t *p_this,
+                                     IBaseFilter *p_filter, vlc_bool_t b_audio,
+                                     int i_chroma, int i_width, int i_height )
+{
+    IEnumPins *p_enumpins;
+    IPin *p_output_pin;
+    IEnumMediaTypes *p_enummt;
+
+    AM_MEDIA_TYPE media_type;
+    media_type.majortype = GUID_NULL;
+    media_type.subtype = GUID_NULL;
+    media_type.formattype = GUID_NULL;
+    media_type.pUnk = NULL;
+    media_type.cbFormat = 0;
+    media_type.pbFormat = NULL;
+
+    if( S_OK != p_filter->EnumPins( &p_enumpins ) ) return media_type;
+
+    /*while*/if( p_enumpins->Next( 1, &p_output_pin, NULL ) == S_OK )
+    {
+        /* Probe pin */
+        if( !b_audio &&
+            SUCCEEDED( p_output_pin->EnumMediaTypes( &p_enummt ) ) )
+        {
+            AM_MEDIA_TYPE *p_mt;
+            while( p_enummt->Next( 1, &p_mt, NULL ) == S_OK )
+            {
+                int i_fourcc = VLC_FOURCC(' ', ' ', ' ', ' ');
+
+                /* Packed RGB formats */
+                if( p_mt->subtype == MEDIASUBTYPE_RGB1 )
+                    i_fourcc = VLC_FOURCC( 'R', 'G', 'B', '1' );
+                if( p_mt->subtype == MEDIASUBTYPE_RGB4 )
+                    i_fourcc = VLC_FOURCC( 'R', 'G', 'B', '4' );
+                if( p_mt->subtype == MEDIASUBTYPE_RGB8 )
+                    i_fourcc = VLC_FOURCC( 'R', 'G', 'B', '8' );
+                else if( p_mt->subtype == MEDIASUBTYPE_RGB555 )
+                    i_fourcc = VLC_FOURCC( 'R', 'V', '1', '5' );
+                else if( p_mt->subtype == MEDIASUBTYPE_RGB565 )
+                    i_fourcc = VLC_FOURCC( 'R', 'V', '1', '6' );
+                else if( p_mt->subtype == MEDIASUBTYPE_RGB24 )
+                    i_fourcc = VLC_FOURCC( 'R', 'V', '2', '4' );
+                else if( p_mt->subtype == MEDIASUBTYPE_RGB32 )
+                    i_fourcc = VLC_FOURCC( 'R', 'V', '3', '2' );
+                else if( p_mt->subtype == MEDIASUBTYPE_ARGB32 )
+                    i_fourcc = VLC_FOURCC( 'R', 'G', 'B', 'A' );
+                else i_fourcc = *((int *)&p_mt->subtype);
+
+                int i_current_width = p_mt->pbFormat ?
+                  ((VIDEOINFOHEADER *)p_mt->pbFormat)->bmiHeader.biWidth : 0;
+                int i_current_height = p_mt->pbFormat ?
+                  ((VIDEOINFOHEADER *)p_mt->pbFormat)->bmiHeader.biHeight : 0;
+
+                msg_Dbg( p_this, "EnumDeviceCaps: input pin "
+                         "accepts chroma: %4.4s, width:%i, height:%i",
+                         (char *)&i_fourcc, i_current_width,
+                         i_current_height );
+
+                if( i_fourcc == i_chroma )
+                {
+                    media_type.subtype = p_mt->subtype;
+                }
+
+                if( i_fourcc == i_chroma && p_mt->pbFormat &&
+                    i_width && i_height && i_width == i_current_width &&
+                    i_height == i_current_height )
+                {
+                    media_type = *p_mt;
+                }
+                else
+                {
+                    FreeMediaType( *p_mt );
+                }
+                CoTaskMemFree( (PVOID)p_mt );
+            }
+            p_enummt->Release();
+        }
+        p_output_pin->Release();
+    }
+
+    p_enumpins->Release();
+    return media_type;
+}
+
-/*****************************************************************************
- * Read: reads from the device into PES packets.

modules/access/dshow/filter.cpp

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2002 VideoLAN
-4 2003/08/27 07:31:26
+5 2003/08/31 22:06:17
- *
- * Author: Gildas Bazin <gbazin@netcourrier.com>
@@ -33 +33 @@
-#include <vlc/vout.h>
-
-#ifndef _MSC_VER
-#   include <wtypes.h>
-#   include <unknwn.h>
-#   include <ole2.h>
-#   include <limits.h>
-#   define _WINGDI_ 1
-#   define AM_NOVTABLE
-#   define _OBJBASE_H_
-#   undef _X86_
-#   define _I64_MAX LONG_LONG_MAX
-#   define LONGLONG long long
-#endif
-
-#include <dshow.h>
-
-#include "filter.h"
-
@@ -80 +65 @@
-const GUID MEDIATYPE_Video = {0x73646976, 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}};
-
+/* Packed RGB formats */
+const GUID MEDIASUBTYPE_RGB1 = {0xe436eb78, 0x524f, 0x11ce, {0x9f, 0x53, 0x00, 0x20, 0xaf, 0x0b, 0xa7, 0x70}};
+const GUID MEDIASUBTYPE_RGB4 = {0xe436eb79, 0x524f, 0x11ce, {0x9f, 0x53, 0x00, 0x20, 0xaf, 0x0b, 0xa7, 0x70}};
-const GUID MEDIASUBTYPE_RGB8 = {0xe436eb7a, 0x524f, 0x11ce, {0x9f, 0x53, 0x00, 0x20, 0xaf, 0x0b, 0xa7, 0x70}};
-const GUID MEDIASUBTYPE_RGB565 = {0xe436eb7b, 0x524f, 0x11ce, {0x9f, 0x53, 0x00, 0x20, 0xaf, 0x0b, 0xa7, 0x70}};
@@ -87 +75 @@
-const GUID MEDIASUBTYPE_ARGB32 = {0x773c9ac0, 0x3274, 0x11d0, {0xb7, 0x24, 0x0, 0xaa, 0x0, 0x6c, 0x1a, 0x1}};
-
+/* Packed YUV formats */
-const GUID MEDIASUBTYPE_YUYV = {0x56595559, 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}};
-const GUID MEDIASUBTYPE_Y411 = {0x31313459, 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}};
-41P = {0x503134
+211 = {0x313132
-const GUID MEDIASUBTYPE_YUY2 = {0x32595559, 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}};
-const GUID MEDIASUBTYPE_YVYU = {0x55595659, 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}};
-const GUID MEDIASUBTYPE_UYVY = {0x59565955, 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}};
-
+
+
+
-const GUID MEDIASUBTYPE_YV12 = {0x32315659, 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}};
+const GUID MEDIASUBTYPE_IYUV = {0x56555949, 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}}; /* identical to YV12 */
+const GUID MEDIASUBTYPE_Y41P = {0x50313459, 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}};
+const GUID MEDIASUBTYPE_I420 = {0x30323449, 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}};
-
-const GUID MEDIATYPE_Audio = {0x73647561, 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}};
-const GUID FORMAT_WaveFormatEx = {0x05589f81, 0xc356, 0x11ce, {0xbf, 0x01, 0x00, 0xaa, 0x00, 0x55, 0x59, 0x5a}};
-const GUID MEDIASUBTYPE_PCM = {0x00000001, 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}};
+
+const GUID GUID_NULL = {0x0000, 0x0000, 0x0000, {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}};
-
-void WINAPI FreeMediaType( AM_MEDIA_TYPE& mt )
@@ -145 +141 @@
- ****************************************************************************/
-
-
+
+
-  : p_input( _p_input ), p_filter( _p_filter ), p_connected_pin( NULL ),
-
+media_type( mt ), 
-{
-}
@@ -233 +230 @@
-#endif
-
+    if( pmt->majortype == MEDIATYPE_Video )
+    {
+        if( media_type.subtype != GUID_NULL &&
+            media_type.subtype != pmt->subtype )
+            return VFW_E_TYPE_NOT_ACCEPTED;
+
+        if( media_type.pbFormat &&
+            ((VIDEOINFOHEADER *)media_type.pbFormat)->bmiHeader.biHeight &&
+            ((VIDEOINFOHEADER *)media_type.pbFormat)->bmiHeader.biHeight !=
+            ((VIDEOINFOHEADER *)pmt->pbFormat)->bmiHeader.biHeight )
+            return VFW_E_TYPE_NOT_ACCEPTED;
+
+        if( media_type.pbFormat &&
+            ((VIDEOINFOHEADER *)media_type.pbFormat)->bmiHeader.biWidth &&
+            ((VIDEOINFOHEADER *)media_type.pbFormat)->bmiHeader.biWidth !=
+            ((VIDEOINFOHEADER *)pmt->pbFormat)->bmiHeader.biWidth )
+            return VFW_E_TYPE_NOT_ACCEPTED;
+    }
+
-    p_connected_pin = pConnector;
-    p_connected_pin->AddRef();
+
+    FreeMediaType( media_type );
-    return CopyMediaType( &media_type, pmt );
-}
@@ -436 +454 @@
- ****************************************************************************/
-
-
-
-
+, AM_MEDIA_TYPE mt
+, mt
+media_type( mt ), 
-{
-}
@@ -752 +770 @@
-
-    /* Are we creating a new enumerator */
-
-    if( pEnumMediaTypes == NULL )
-    {
@@ -817 +834 @@
-#endif
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-    return S_FALSE;
-};
@@ -839 +843 @@
-#endif
-
-
-
-
-
-
-
-
+
-};
-STDMETHODIMP CaptureEnumMediaTypes::Reset()

modules/access/dshow/filter.h

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2002 VideoLAN
-1 2003/08/24 11:17:39
+2 2003/08/31 22:06:17
- *
- * Author: Gildas Bazin <gbazin@netcourrier.com>
@@ -30 +30 @@
-using namespace std;
-
+#ifndef _MSC_VER
+#   include <wtypes.h>
+#   include <unknwn.h>
+#   include <ole2.h>
+#   include <limits.h>
+#   define _WINGDI_ 1
+#   define AM_NOVTABLE
+#   define _OBJBASE_H_
+#   undef _X86_
+#   define _I64_MAX LONG_LONG_MAX
+#   define LONGLONG long long
+#endif
+
+#include <dshow.h>
+
+extern const GUID MEDIASUBTYPE_I420;
+
-typedef struct VLCMediaSample
-{
@@ -48 +65 @@
-class CapturePin: public IPin, public IMemInputPin
-{
-
-
-
+
+
-
-    IPin *p_connected_pin;
@@ -60 +76 @@
-
-  public:
-
+
+
-    virtual ~CapturePin();
-
@@ -107 +124 @@
-class CaptureFilter : public IBaseFilter
-{
-
-
-
+
+
+
+
-
-    int i_ref;
-
-  public:
-
+, AM_MEDIA_TYPE mt
-    virtual ~CaptureFilter();
-
@@ -150 +168 @@
-{
-    input_thread_t * p_input;
+    CaptureFilter  *p_filter;
+
-    int i_position;
-    CaptureFilter *p_filter;
-
-    int i_ref;
-
@@ -178 +196 @@
-{
-    input_thread_t * p_input;
+    CapturePin     *p_pin;
+
-    int i_position;
-    CapturePin *p_pin;
-
-    int i_ref;
-