⚠ Archived content — this site is no longer maintained.   Current WebKit documentation is at docs.webkit.org.

Changeset 246358 in webkit


Ignore:
Timestamp:
Jun 12, 2019, 9:52:34 AM (7 years ago)
Author:
youenn@apple.com
Message:

Make sure libwebrtc ObjC codec interfaces do not conflict
​https://bugs.webkit.org/show_bug.cgi?id=198782
<rdar://problem/51503247>

Reviewed by Eric Carlson.

Rename some ObjC interfaces that we are now using in libwebrtc.

  • Source/webrtc/sdk/objc/api/video_codec/RTCVideoDecoderVP8.h:
  • Source/webrtc/sdk/objc/api/video_codec/RTCWrappedNativeVideoDecoder.h:
  • Source/webrtc/sdk/objc/api/video_codec/RTCWrappedNativeVideoEncoder.h:
  • libwebrtc.xcodeproj/project.pbxproj:
Location:
trunk/Source/ThirdParty/libwebrtc
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/ThirdParty/libwebrtc/ChangeLog

    r246263 r246358  
     12019-06-12  Youenn Fablet  <youenn@apple.com>
     2
     3        Make sure libwebrtc ObjC codec interfaces do not conflict
     4        https://bugs.webkit.org/show_bug.cgi?id=198782
     5        <rdar://problem/51503247>
     6
     7        Reviewed by Eric Carlson.
     8
     9        Rename some ObjC interfaces that we are now using in libwebrtc.
     10
     11        * Source/webrtc/sdk/objc/api/video_codec/RTCVideoDecoderVP8.h:
     12        * Source/webrtc/sdk/objc/api/video_codec/RTCWrappedNativeVideoDecoder.h:
     13        * Source/webrtc/sdk/objc/api/video_codec/RTCWrappedNativeVideoEncoder.h:
     14        * libwebrtc.xcodeproj/project.pbxproj:
     15
    1162019-06-10  Youenn Fablet  <youenn@apple.com>
    217

  • trunk/Source/ThirdParty/libwebrtc/Source/webrtc/sdk/objc/api/video_codec/RTCVideoDecoderVP8.h

    r237075 r246358  
    1515
    1616RTC_OBJC_EXPORT
     17__attribute__((objc_runtime_name("WK_RTCVideoDecoderVP8")))
    1718@interface RTCVideoDecoderVP8 : NSObject
    1819

  • trunk/Source/ThirdParty/libwebrtc/Source/webrtc/sdk/objc/api/video_codec/RTCWrappedNativeVideoDecoder.h

    r237075 r246358  
    1616#include "media/base/codec.h"
    1717
     18RTC_OBJC_EXPORT
     19__attribute__((objc_runtime_name("WK_RTCWrappedNativeVideoDecoder")))
    1820@interface RTCWrappedNativeVideoDecoder : NSObject <RTCVideoDecoder>
    1921

  • trunk/Source/ThirdParty/libwebrtc/Source/webrtc/sdk/objc/api/video_codec/RTCWrappedNativeVideoEncoder.h

    r237075 r246358  
    1717#include "media/base/codec.h"
    1818
     19RTC_OBJC_EXPORT
     20__attribute__((objc_runtime_name("WK_RTCWrappedNativeVideoEncoder")))
    1921@interface RTCWrappedNativeVideoEncoder : NSObject <RTCVideoEncoder>
    2022

  • trunk/Source/ThirdParty/libwebrtc/libwebrtc.xcodeproj/project.pbxproj

    r244568 r246358  
    398398                413E67692169854B00EF37ED /* RTCVideoEncoderVP8.h in Headers */ = {isa = PBXBuildFile; fileRef = 417954012169851F0028266B /* RTCVideoEncoderVP8.h */; };
    399399                413E676A2169854B00EF37ED /* RTCWrappedNativeVideoDecoder.h in Headers */ = {isa = PBXBuildFile; fileRef = 417953FE2169851F0028266B /* RTCWrappedNativeVideoDecoder.h */; };
    400                 413E676B2169854B00EF37ED /* RTCWrappedNativeVideoDecoder.mm in Sources */ = {isa = PBXBuildFile; fileRef = 41795403216985200028266B /* RTCWrappedNativeVideoDecoder.mm */; };
    401400                413E676C2169854B00EF37ED /* RTCWrappedNativeVideoEncoder.h in Headers */ = {isa = PBXBuildFile; fileRef = 41795404216985200028266B /* RTCWrappedNativeVideoEncoder.h */; };
    402401                413E676D2169854B00EF37ED /* RTCWrappedNativeVideoEncoder.mm in Sources */ = {isa = PBXBuildFile; fileRef = 417954002169851F0028266B /* RTCWrappedNativeVideoEncoder.mm */; };
    … …  
    424423                413E67A32169889500EF37ED /* RTCVideoEncoderQpThresholds.m in Sources */ = {isa = PBXBuildFile; fileRef = 413E679F2169889500EF37ED /* RTCVideoEncoderQpThresholds.m */; };
    425424                413E67A5216988DC00EF37ED /* video_stream_encoder_observer.cc in Sources */ = {isa = PBXBuildFile; fileRef = 413E67A4216988DC00EF37ED /* video_stream_encoder_observer.cc */; };
     425                413F4D7022B0BAEF006A7A6B /* RTCVideoDecoderVP8.h in Headers */ = {isa = PBXBuildFile; fileRef = 413F4D6F22B0BAEE006A7A6B /* RTCVideoDecoderVP8.h */; };
     426                413F4D7122B0BB18006A7A6B /* RTCWrappedNativeVideoDecoder.mm in Sources */ = {isa = PBXBuildFile; fileRef = 41795403216985200028266B /* RTCWrappedNativeVideoDecoder.mm */; };
    426427                4140B8201E4E3383007409E6 /* audio_encoder_pcm.cc in Sources */ = {isa = PBXBuildFile; fileRef = 4140B8181E4E3383007409E6 /* audio_encoder_pcm.cc */; };
    427428                4140B8211E4E3383007409E6 /* audio_encoder_pcm.h in Headers */ = {isa = PBXBuildFile; fileRef = 4140B8191E4E3383007409E6 /* audio_encoder_pcm.h */; };
    … …  
    42084209                413E67A92169894C00EF37ED /* RTCNativeI420Buffer.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RTCNativeI420Buffer.h; sourceTree = "<group>"; };
    42094210                413E67AA2169894C00EF37ED /* RTCNativeMutableI420Buffer.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RTCNativeMutableI420Buffer.h; sourceTree = "<group>"; };
     4211                413F4D6F22B0BAEE006A7A6B /* RTCVideoDecoderVP8.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RTCVideoDecoderVP8.h; sourceTree = "<group>"; };
    42104212                4140B8181E4E3383007409E6 /* audio_encoder_pcm.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = audio_encoder_pcm.cc; path = g711/audio_encoder_pcm.cc; sourceTree = "<group>"; };
    42114213                4140B8191E4E3383007409E6 /* audio_encoder_pcm.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = audio_encoder_pcm.h; path = g711/audio_encoder_pcm.h; sourceTree = "<group>"; };
    … …  
    86748676                                417953FF2169851F0028266B /* RTCVideoCodecConstants.mm */,
    86758677                                41795402216985200028266B /* RTCVideoDecoderVP8.mm */,
     8678                                413F4D6F22B0BAEE006A7A6B /* RTCVideoDecoderVP8.h */,
    86768679                                417954012169851F0028266B /* RTCVideoEncoderVP8.h */,
    86778680                                413E67642169854500EF37ED /* RTCVideoEncoderVP8.mm */,
    … …  
    1494914952                                5CDD8BF01E43C2B500621E92 /* swap_bytes.h in Headers */,
    1495014953                                413A23471FE18E0700373E99 /* swap_queue.h in Headers */,
     14954                                413F4D7022B0BAEF006A7A6B /* RTCVideoDecoderVP8.h in Headers */,
    1495114955                                419241A9212758D300634FCF /* symmetric_matrix_buffer.h in Headers */,
    1495214956                                41BE71A3215C463700A7B196 /* symrec.h in Headers */,
    … …  
    1640916413                                5CDD8AD21E43C23900621E92 /* audio_state.cc in Sources */,
    1641016414                                415F1FC62127308F00064CBF /* audio_state.cc in Sources */,
     16415                                413F4D7122B0BB18006A7A6B /* RTCWrappedNativeVideoDecoder.mm in Sources */,
    1641116416                                41F9BF9B2051C84C00ABF0B9 /* audio_transport_impl.cc in Sources */,
    1641216417                                5C4B4C5F1E431F9C002651C8 /* audio_util.cc in Sources */,
    … …  
    1703717042                                413E67652169854600EF37ED /* RTCVideoEncoderVP8.mm in Sources */,
    1703817043                                413E6790216987DB00EF37ED /* RTCVideoFrame.mm in Sources */,
    17039                                 413E676B2169854B00EF37ED /* RTCWrappedNativeVideoDecoder.mm in Sources */,
    1704017044                                413E676D2169854B00EF37ED /* RTCWrappedNativeVideoEncoder.mm in Sources */,
    1704117045                                41D6B45921273159008F9353 /* rtp_bitrate_configurator.cc in Sources */,
Note: See TracChangeset for help on using the changeset viewer.