Changeset 6147

Timestamp:

Jan 31, 2020 3:15:41 AM (3 years ago)

Author:

riza

Message:

Re #2253:

• Add vpx.h/vpx.c to Visual Studio project files
• Fix compile error/warning from Visual Studio

Location:

pjproject/trunk/pjmedia

Files:

• build/pjmedia_codec.vcproj (modified) (2 diffs)
• build/pjmedia_codec.vcxproj (modified) (2 diffs)
• build/pjmedia_codec.vcxproj.filters (modified) (2 diffs)
• src/pjmedia-codec/vpx.c (modified) (3 diffs)

pjproject/trunk/pjmedia/build/pjmedia_codec.vcproj

@@ -3629 +3629 @@
                                 </FileConfiguration>
                         </File>
+      <File
+                                RelativePath="..\src\pjmedia-codec\vpx.c"
+                                >
+      </File>        
                         <Filter
                                 Name="g722 Files"
@@ -3738 +3742 @@
                                 >
                         </File>
+      <File
+                                RelativePath="..\include\pjmedia-codec\vpx.h"
+                                >
+      </File>      
                 </Filter>
         </Files>

pjproject/trunk/pjmedia/build/pjmedia_codec.vcxproj

@@ -531 +531 @@
     <ClCompile Include="..\src\pjmedia-codec\silk.c" />
     <ClCompile Include="..\src\pjmedia-codec\speex_codec.c" />
+    <ClCompile Include="..\src\pjmedia-codec\vpx.c" />
   </ItemGroup>
   <ItemGroup>
@@ -555 +556 @@
     <ClInclude Include="..\include\pjmedia-codec\speex.h" />
     <ClInclude Include="..\include\pjmedia-codec\types.h" />
+    <ClInclude Include="..\include\pjmedia-codec\vpx.h" />
     <ClInclude Include="..\src\pjmedia-codec\g722\g722_dec.h" />
     <ClInclude Include="..\src\pjmedia-codec\g722\g722_enc.h" />

pjproject/trunk/pjmedia/build/pjmedia_codec.vcxproj.filters

@@ -78 +78 @@
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\src\pjmedia-codec\vpx.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
@@ -152 +155 @@
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\include\pjmedia-codec\vpx.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>

pjproject/trunk/pjmedia/src/pjmedia-codec/vpx.c

@@ -366 +366 @@
     *p_codec = codec;
     return PJ_SUCCESS;
-
-on_error:
-    vpx_dealloc_codec(factory, codec);
-    return PJMEDIA_CODEC_EFAILED;
 }
 
@@ -855 +851 @@
         
             pj_memcpy(vpx_data->dec_buf + whole_len,
-                      packets[i].buf + desc_len, packet_size);
+                      (char *)packets[i].buf + desc_len, packet_size);
             whole_len += packet_size;
         }
@@ -913 +909 @@
 
         for (y = 0; y < h; ++y) {
-            pj_memcpy(output->buf + pos, buf, w);
+            pj_memcpy((char *)output->buf + pos, buf, w);
             pos += w;
             buf += stride;