Skip to content

Commit 3b239c3

Browse files
author
amin
committed
update namespaces and fix dependencies on the root package issue
1 parent 68a6b15 commit 3b239c3

24 files changed

+118
-425
lines changed

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
"quasarstream/vpx": "^1.0",
3535
"quasarstream/opus": "^1.0",
3636
"quasarstream/av": "^1.0",
37-
"quasarstream/rtp": "^1.0"
37+
"quasarstream/rtp-parameter": "^1.0"
3838
},
3939
"require-dev": {
4040
"phpunit/php-code-coverage": "11.0.x-dev",

src/Audio/Opus/OpusDecoder.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@
1616
use Webrtc\AVCodec\Exception\AvCodecException;
1717
use Webrtc\AVCodec\Frame\AudioFrame;
1818
use Webrtc\Codecs\DecoderInterface;
19+
use Webrtc\Codecs\JitterFrameInterface;
1920
use Webrtc\Opus\Decoder;
2021
use Webrtc\Opus\Exception\OpusException;
2122
use Webrtc\Opus\Opus;
22-
use Webrtc\RTP\Jitter\JitterFrame;
2323

2424
/**
2525
* Opus Audio Decoder Class
@@ -58,11 +58,11 @@ public function __construct()
5858
/**
5959
* Decode an Opus packet to audio frame(s)
6060
*
61-
* @param JitterFrame $frame Input frame containing Opus packet and timestamp
61+
* @param JitterFrameInterface $frame Input frame containing Opus packet and timestamp
6262
* @return array Array containing one decoded AudioFrame (Opus uses fixed frame sizes)
6363
* @throws OpusException
6464
*/
65-
public function decode(JitterFrame $frame): array
65+
public function decode(JitterFrameInterface $frame): array
6666
{
6767
$audioFrame = new AudioFrame(samples: 960);
6868
$audioFrame->setPts($frame->getTimestamp());

src/Audio/PCM/PCMDecoder.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
use Webrtc\AVCodec\Exception\AvCodecException;
1919
use Webrtc\AVCodec\TransCoder;
2020
use Webrtc\Codecs\DecoderInterface;
21-
use Webrtc\RTP\Jitter\JitterFrame;
21+
use Webrtc\Codecs\JitterFrameInterface;
2222

2323
/**
2424
* PCM Audio Decoder Abstract Base Class
@@ -60,10 +60,10 @@ public function __construct(string $codecName)
6060
/**
6161
* Decode an audio packet to PCM frames
6262
*
63-
* @param JitterFrame $frame Input frame containing encoded audio and timestamp
63+
* @param JitterFrameInterface $frame Input frame containing encoded audio and timestamp
6464
* @return array Array of decoded AudioFrame objects
6565
*/
66-
public function decode(JitterFrame $frame): array
66+
public function decode(JitterFrameInterface $frame): array
6767
{
6868
$packet = new Packet();
6969
$packet->putData($frame->getData());

src/Codec.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,12 @@
2525
use Webrtc\Codecs\Video\X264\H264Encoder;
2626
use Webrtc\Codecs\Video\X264\H264PayloadDescriptor;
2727
use Webrtc\Exception\InvalidArgumentException;
28-
use Webrtc\RTP\Parameters\RTCRtcpFeedback;
29-
use Webrtc\RTP\Parameters\RTCRtpCapabilities;
30-
use Webrtc\RTP\Parameters\RTCRtpCodecCapability;
31-
use Webrtc\RTP\Parameters\RTCRtpCodecParameters;
32-
use Webrtc\RTP\Parameters\RTCRtpHeaderExtensionCapability;
33-
use Webrtc\RTP\Parameters\RTCRtpHeaderExtensionParameters;
28+
use Webrtc\RTPParameter\RTCRtcpFeedback;
29+
use Webrtc\RTPParameter\RTCRtpCapabilities;
30+
use Webrtc\RTPParameter\RTCRtpCodecCapability;
31+
use Webrtc\RTPParameter\RTCRtpCodecParameters;
32+
use Webrtc\RTPParameter\RTCRtpHeaderExtensionCapability;
33+
use Webrtc\RTPParameter\RTCRtpHeaderExtensionParameters;
3434

3535
/**
3636
* WebRTC Codec Management Class

src/CodecUtility.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111

1212
namespace Webrtc\Codecs;
1313

14-
use Webrtc\RTP\Parameters\RTCRtpCodecCapability;
15-
use Webrtc\RTP\Parameters\RTCRtpCodecParameters;
14+
use Webrtc\RTPParameter\RTCRtpCodecCapability;
15+
use Webrtc\RTPParameter\RTCRtpCodecParameters;
1616

1717
/**
1818
* Codec Utility Class

src/DecoderInterface.php

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,7 @@
1111

1212
namespace Webrtc\Codecs;
1313

14-
use Webrtc\AVCodec\Frame\AudioFrame;
15-
use Webrtc\AVCodec\Frame\FrameInterface;
16-
use Webrtc\AVCodec\Frame\VideoFrame;
17-
use Webrtc\RTP\Jitter\JitterFrame;
18-
1914
interface DecoderInterface
2015
{
21-
/**
22-
* @param JitterFrame $frame
23-
* @return FrameInterface[]|VideoFrame[]|AudioFrame[]
24-
*/
25-
public function decode(JitterFrame $frame): array;
16+
public function decode(JitterFrameInterface $frame): array;
2617
}

src/JitterFrameInterface.php

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<?php
2+
3+
/**
4+
* This file is part of the PHP WebRTC package.
5+
*
6+
* (c) Amin Yazdanpanah <https://www.aminyazdanpanah.com/#contact>
7+
*
8+
* For the full copyright and license information, please view the LICENSE
9+
* file that was distributed with this source code.
10+
*/
11+
12+
namespace Webrtc\Codecs;
13+
14+
interface JitterFrameInterface
15+
{
16+
public function getData(): string;
17+
18+
public function getTimestamp(): int;
19+
}

src/Video/Vp8/Vp8Decoder.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
use Webrtc\AVCodec\Exception\AvCodecException;
1717
use Webrtc\AVCodec\Frame\VideoFrame;
1818
use Webrtc\Codecs\DecoderInterface;
19-
use Webrtc\RTP\Jitter\JitterFrame;
19+
use Webrtc\Codecs\JitterFrameInterface;
2020
use Webrtc\VPX\Context;
2121
use Webrtc\VPX\Decoder;
2222
use Webrtc\VPX\Enum\BriefInterface;
@@ -58,12 +58,12 @@ public function __construct()
5858
/**
5959
* Decodes a VP8-encoded video frame
6060
*
61-
* @param JitterFrame $frame Input frame containing VP8 payload and timestamp
61+
* @param JitterFrameInterface $frame Input frame containing VP8 payload and timestamp
6262
* @return VideoFrame[] Array of decoded video frames
6363
* @throws VpxException
6464
* @throws AvCodecException
6565
*/
66-
public function decode(JitterFrame $frame): array
66+
public function decode(JitterFrameInterface $frame): array
6767
{
6868
$frames = [];
6969
$images = $this->decoder->decode($frame->getData());
@@ -79,11 +79,11 @@ public function decode(JitterFrame $frame): array
7979
* Creates a VideoFrame from decoded image data
8080
*
8181
* @param CData $image Decoded image data from libvpx
82-
* @param JitterFrame $frame Source frame with timestamp
82+
* @param JitterFrameInterface $frame Source frame with timestamp
8383
* @return VideoFrame Configured video frame object
8484
* @throws AvCodecException
8585
*/
86-
private function generateFrame(CData $image, JitterFrame $frame): VideoFrame
86+
private function generateFrame(CData $image, JitterFrameInterface $frame): VideoFrame
8787
{
8888
$videoFrame = new VideoFrame($image->d_w, $image->d_h);
8989
$videoFrame->setPts($frame->getTimestamp());

src/Video/X264/H264Decoder.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
use Webrtc\AVCodec\Exception\AvCodecException;
2020
use Webrtc\AVCodec\TransCoder;
2121
use Webrtc\Codecs\DecoderInterface;
22-
use Webrtc\RTP\Jitter\JitterFrame;
22+
use Webrtc\Codecs\JitterFrameInterface;
2323

2424
/**
2525
* H.264 Video Decoder Class
@@ -54,13 +54,13 @@ public function __construct()
5454
/**
5555
* Decodes an H.264 encoded frame
5656
*
57-
* @param JitterFrame $frame Input frame containing:
57+
* @param JitterFrameInterface $frame Input frame containing:
5858
* - Data: Encoded H.264 payload
5959
* - timestamp: Presentation timestamp
6060
* @return array Array of decoded VideoFrame objects
6161
* Empty array on decoding failure
6262
*/
63-
public function decode(JitterFrame $frame): array
63+
public function decode(JitterFrameInterface $frame): array
6464
{
6565
try {
6666
$packet = new Packet();

tests/Audio/AudioEncoderTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@
55
use PHPUnit\Framework\Attributes\CoversClass;
66
use PHPUnit\Framework\TestCase;
77
use Tests\Webrtc\Codecs\Fraction;
8+
use Tests\Webrtc\Codecs\JitterFrame;
89
use Webrtc\AVCodec\Data\Packet;
910
use Webrtc\AVCodec\Frame\AudioFrame;
1011
use Webrtc\Codecs\Codec;
1112
use Webrtc\Codecs\DecoderInterface;
1213
use Webrtc\Codecs\Encoder;
1314
use Webrtc\Codecs\EncoderInterface;
14-
use Webrtc\RTP\Jitter\JitterFrame;
1515

1616
#[CoversClass(Encoder::class)]
1717
class AudioEncoderTest extends TestCase

0 commit comments

Comments
 (0)