qq27800734/taoyao
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[+] 优化代码

Browse Source
This commit is contained in:
acgist
2025-11-13 15:12:42 +08:00
parent f9de241e09
commit 32a828aead
1 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
taoyao-client-android/taoyao/media/src/main/java/com/acgist/taoyao/media/video/ShareVideoCapturer.java
View File

@@ -13,10 +13,9 @@ import org.webrtc.VideoSink;
import org.webrtc.VideoTrack; import org.webrtc.VideoTrack;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.concurrent.atomic.AtomicInteger;
/** /**
* 注意：只是功能验证，没有实现资源释放。 * 注意：只是功能验证，没有实现资源释放。
@@ -54,7 +53,7 @@ public class ShareVideoCapturer implements VideoCapturer {
null null
); );
this.clearBuffer(buffer); this.clearBuffer(buffer);
final List<VideoFrame.I420Buffer> buffers = new ArrayList<>(); final AtomicInteger index = new AtomicInteger(0);
while(ShareVideoCapturer.this.running) { while(ShareVideoCapturer.this.running) {
synchronized (ShareVideoCapturer.this.frames) { synchronized (ShareVideoCapturer.this.frames) {
do { do {
@@ -65,6 +64,7 @@ public class ShareVideoCapturer implements VideoCapturer {
Log.e(ShareVideoCapturer.class.getSimpleName(), "等待异常", e); Log.e(ShareVideoCapturer.class.getSimpleName(), "等待异常", e);
} }
} while(ShareVideoCapturer.this.frames.isEmpty()); } while(ShareVideoCapturer.this.frames.isEmpty());
index.set(0);
ShareVideoCapturer.this.frames.forEach((k, v) -> { ShareVideoCapturer.this.frames.forEach((k, v) -> {
final VideoFrame.Buffer c = v.getBuffer(); final VideoFrame.Buffer c = v.getBuffer();
final VideoFrame.Buffer o = c.cropAndScale(0, 0, c.getWidth(), c.getHeight(), width_, height_); final VideoFrame.Buffer o = c.cropAndScale(0, 0, c.getWidth(), c.getHeight(), width_, height_);
@@ -73,18 +73,19 @@ public class ShareVideoCapturer implements VideoCapturer {
// buffer.getDataY().put(x.getDataY()); // buffer.getDataY().put(x.getDataY());
// buffer.getDataU().put(x.getDataU()); // buffer.getDataU().put(x.getDataU());
// buffer.getDataV().put(x.getDataV()); // buffer.getDataV().put(x.getDataV());
buffers.add(x); final int row_ = index.get() / col;
o.release(); final int col_ = index.get() % col;
v.release();
});
for (int i = 0; i < buffers.size(); i++) {
final int row_ = i / col;
final int col_ = i % col;
final int dstX = col_ * width_; final int dstX = col_ * width_;
final int dstY = row_ * height_; final int dstY = row_ * height_;
ShareVideoCapturer.this.copyBuffer(buffers.get(i), buffer, dstX, dstY); ShareVideoCapturer.this.copyBuffer(x, buffer, dstX, dstY);
} x.release();
buffers.clear(); o.release();
v.release();
index.incrementAndGet();
if(index.get() >= col * row) {
index.set(0);
}
});
ShareVideoCapturer.this.frames.clear(); ShareVideoCapturer.this.frames.clear();
final VideoFrame frame = new VideoFrame( final VideoFrame frame = new VideoFrame(
buffer, buffer,