Work-in-progress on Adopt AVCF media back end on Windows
authorjeffm@apple.com <jeffm@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 30 Jul 2011 00:51:44 +0000 (00:51 +0000)
committerjeffm@apple.com <jeffm@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 30 Jul 2011 00:51:44 +0000 (00:51 +0000)
https://bugs.webkit.org/show_bug.cgi?id=65400
<rdar://problem/9083559>

Prepare WebCore.vcproj to support AVCF media back end on Windows.

Reviewed by Darin Adler.

No changes to functionality so no new tests.

* WebCore.vcproj/WebCore.vcproj: Added MediaPlayerPrivateAVFoundation and MediaPlayerPrivateAVFoundationCF sources.
* WebCore.vcproj/WebCoreMediaQT.vsprops: Added additional include directories and dleay load DLLs for AVCF.
* platform/graphics/avfoundation/MediaPlayerPrivateAVFoundationCF.cpp: Added, just a stub for now.
* platform/graphics/avfoundation/MediaPlayerPrivateAVFoundationCF.h: Added, just a stub for now.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@92035 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/ChangeLog
Source/WebCore/WebCore.vcproj/WebCore.vcproj
Source/WebCore/WebCore.vcproj/WebCoreMediaQT.vsprops
Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundationCF.cpp [new file with mode: 0644]
Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundationCF.h [new file with mode: 0644]

index 7a83899..af4e7d4 100644 (file)
@@ -4,6 +4,23 @@
         https://bugs.webkit.org/show_bug.cgi?id=65400
         <rdar://problem/9083559>
         
+        Prepare WebCore.vcproj to support AVCF media back end on Windows.
+
+        Reviewed by Darin Adler.
+
+        No changes to functionality so no new tests.
+
+        * WebCore.vcproj/WebCore.vcproj: Added MediaPlayerPrivateAVFoundation and MediaPlayerPrivateAVFoundationCF sources.
+        * WebCore.vcproj/WebCoreMediaQT.vsprops: Added additional include directories and dleay load DLLs for AVCF.
+        * platform/graphics/avfoundation/MediaPlayerPrivateAVFoundationCF.cpp: Added, just a stub for now.
+        * platform/graphics/avfoundation/MediaPlayerPrivateAVFoundationCF.h: Added, just a stub for now.
+
+2011-07-29  Jeff Miller  <jeffm@apple.com>
+
+        Work-in-progress on Adopt AVCF media back end on Windows
+        https://bugs.webkit.org/show_bug.cgi?id=65400
+        <rdar://problem/9083559>
+        
         Make MediaPlayerPrivateAVFoundation::setDelayCallbacks() const and make the ivars
         it references mutable so other const member functions can call it.
 
index fa698a5..0603823 100755 (executable)
                                                </File>
                                        </Filter>
                                </Filter>
+                               <Filter
+                                       Name="avfoundation"
+                                       >
+                                       <File
+                                               RelativePath="..\platform\graphics\avfoundation\MediaPlayerPrivateAVFoundation.cpp"
+                                               >
+                                       </File>
+                                       <File
+                                               RelativePath="..\platform\graphics\avfoundation\MediaPlayerPrivateAVFoundation.h"
+                                               >
+                                       </File>
+                                       <File
+                                               RelativePath="..\platform\graphics\avfoundation\MediaPlayerPrivateAVFoundationCF.cpp"
+                                               >
+                                       </File>
+                                       <File
+                                               RelativePath="..\platform\graphics\avfoundation\MediaPlayerPrivateAVFoundationCF.h"
+                                               >
+                                       </File>
+                               </Filter>
                        </Filter>
                        <Filter
                                Name="network"
index da0f5a2..04371c5 100644 (file)
@@ -4,4 +4,12 @@
        Version="8.00"
        Name="WebCoreMediaQT"
        >
+       <Tool
+               Name="VCCLCompilerTool"
+               AdditionalIncludeDirectories="&quot;$(WebKitLibrariesDir)\include\CoreAudio&quot;;&quot;$(WebKitLibrariesDir)\include\AVFoundation&quot;;&quot;$(ProjectDir)..\platform\graphics\avfoundation&quot;"
+       />
+       <Tool
+               Name="VCLinkerTool"
+               DelayLoadDLLs="AVFoundationCF.dll;CoreVideo$(WebKitConfigSuffix).dll;MediaToolbox$(WebKitConfigSuffix).dll"
+       />
 </VisualStudioPropertySheet>
diff --git a/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundationCF.cpp b/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundationCF.cpp
new file mode 100644 (file)
index 0000000..84cb404
--- /dev/null
@@ -0,0 +1,24 @@
+/*
+ * Copyright (C) 2011 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
+ */
diff --git a/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundationCF.h b/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundationCF.h
new file mode 100644 (file)
index 0000000..d9ac4ef
--- /dev/null
@@ -0,0 +1,29 @@
+/*
+ * Copyright (C) 2011 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
+ */
+
+#ifndef MediaPlayerPrivateAVFoundationCF_h
+#define MediaPlayerPrivateAVFoundationCF_h
+
+#endif // MediaPlayerPrivateAVFoundationCF_h