@libmedia/avutil 1.1.0 → 1.3.0

package/dist/esm/struct/rational.js

@@ -8,30 +8,30 @@ export class AVRational {
     constructor(init) {
         init && (this.den = init.den, this.num = init.num);
     }
+    static {
+        const prototype = this.prototype, map = new Map;
+        map.set("num", {
+            0: 15,
+            1: 0,
+            2: 0,
+            3: 0,
+            4: 0,
+            5: 0,
+            6: 0,
+            7: 0,
+            8: 0
+        }), map.set("den", {
+            0: 15,
+            1: 0,
+            2: 0,
+            3: 0,
+            4: 0,
+            5: 0,
+            6: 0,
+            7: 4,
+            8: 0
+        }), cheap__definedMetaProperty__0(prototype, cheap__symbolStruct__1, !0), cheap__definedMetaProperty__0(prototype, cheap__symbolStructMaxBaseTypeByteLength__2, 4), 
+        cheap__definedMetaProperty__0(prototype, cheap__symbolStructLength__3, 8), cheap__definedMetaProperty__0(prototype, cheap__symbolStructKeysMeta__4, map);
+    }
 }
-
-var prototype, map;
-
-prototype = AVRational.prototype, (map = new Map).set("num", {
-    0: 15,
-    1: 0,
-    2: 0,
-    3: 0,
-    4: 0,
-    5: 0,
-    6: 0,
-    7: 0,
-    8: 0
-}), map.set("den", {
-    0: 15,
-    1: 0,
-    2: 0,
-    3: 0,
-    4: 0,
-    5: 0,
-    6: 0,
-    7: 4,
-    8: 0
-}), cheap__definedMetaProperty__0(prototype, cheap__symbolStruct__1, !0), cheap__definedMetaProperty__0(prototype, cheap__symbolStructMaxBaseTypeByteLength__2, 4), 
-cheap__definedMetaProperty__0(prototype, cheap__symbolStructLength__3, 8), cheap__definedMetaProperty__0(prototype, cheap__symbolStructKeysMeta__4, map);
 //# sourceMappingURL=rational.js.map

package/dist/esm/util/avbuffer.d.ts

@@ -1,5 +1,5 @@
-import type { AVBufferPool } from "../struct/avbuffer.d.ts";
-import { AVBuffer, AVBufferRef } from "../struct/avbuffer.d.ts";
+import type { AVBufferPool } from "../struct/avbuffer.ts";
+import { AVBuffer, AVBufferRef } from "../struct/avbuffer.ts";
 export declare function bufferCreate(buf: pointer<AVBuffer>, data: pointer<uint8>, size: size, free?: pointer<(opaque: pointer<void>, data: pointer<uint8>) => void>, opaque?: pointer<void>, flags?: int32): pointer<AVBufferRef>;
 export declare function avbufferCreate(data: pointer<uint8>, size: size, free?: pointer<(opaque: pointer<void>, data: pointer<uint8>) => void>, opaque?: pointer<void>, flags?: int32): pointer<AVBufferRef>;
 export declare function avbufferAlloc(size: size): pointer<AVBufferRef>;

package/dist/esm/util/avdict.d.ts

@@ -1,5 +1,5 @@
-import type { AVDictionary } from "../struct/avdict.d.ts";
-import { AVDictionaryEntry } from "../struct/avdict.d.ts";
+import type { AVDictionary } from "../struct/avdict.ts";
+import { AVDictionaryEntry } from "../struct/avdict.ts";
 export declare function freeAVDict(pm: pointer<pointer<AVDictionary>>): void;
 export declare function freeAVDict2(m: pointer<AVDictionary>): void;
 export declare function avDictCount(m: pointer<AVDictionary>): 0 | int32;

package/dist/esm/util/avframe.d.ts

@@ -1,5 +1,5 @@
-import type { AVFrameSideDataType } from "../struct/avframe.d.ts";
-import AVFrame, { AVFrameSideData } from "../struct/avframe.d.ts";
+import type { AVFrameSideDataType } from "../struct/avframe.ts";
+import AVFrame, { AVFrameSideData } from "../struct/avframe.ts";
 export declare enum AV_FRAME_SIDE_DATA_FLAG {
     UNIQUE = 1
 }

package/dist/esm/util/avpacket.d.ts

@@ -1,5 +1,5 @@
-import AVPacket, { AVPacketSideData } from "../struct/avpacket.d.ts";
-import type { AVPacketSideDataType } from "../codec.d.ts";
+import AVPacket, { AVPacketSideData } from "../struct/avpacket.ts";
+import type { AVPacketSideDataType } from "../codec.ts";
 import { type SafeUint8Array } from "@libmedia/cheap";
 export declare function getAVPacketData(avpacket: pointer<AVPacket>): Uint8Array<ArrayBufferLike>;
 export declare function getAVPacketData(avpacket: pointer<AVPacket>, safe: boolean): SafeUint8Array;

package/dist/esm/util/channel.d.ts

@@ -1,4 +1,4 @@
-import type { AVChannelLayout } from "../struct/audiosample.d.ts";
+import type { AVChannelLayout } from "../struct/audiosample.ts";
 export declare function getChannelLayoutNBChannels(layout: uint64): number;
 export declare function unInitChannelLayout(channelLayout: pointer<AVChannelLayout>): void;
 export declare function setChannelLayoutFromMask(channelLayout: pointer<AVChannelLayout>, mask: uint64): 0 | -3;

package/dist/esm/util/codecparameters.d.ts

@@ -1,6 +1,6 @@
-import type AVCodecParameters from "../struct/avcodecparameters.d.ts";
-export { default as isHdr } from '../function/isHdr.d.ts';
-export { default as hasAlphaChannel } from '../function/hasAlphaChannel.d.ts';
+import type AVCodecParameters from "../struct/avcodecparameters.ts";
+export { default as isHdr } from '../function/isHdr.ts';
+export { default as hasAlphaChannel } from '../function/hasAlphaChannel.ts';
 export declare function copyCodecParameters(dst: pointer<AVCodecParameters>, src: pointer<AVCodecParameters>): void;
 export declare function resetCodecParameters(par: pointer<AVCodecParameters>): void;
 export declare function freeCodecParameters(par: pointer<AVCodecParameters>): void;

package/dist/esm/util/encryption.d.ts

@@ -1,4 +1,4 @@
-import type { EncryptionInfo, EncryptionInitInfo } from "../struct/encryption.d.ts";
+import type { EncryptionInfo, EncryptionInitInfo } from "../struct/encryption.ts";
 import { type Uint8ArrayInterface } from "@libmedia/common/io";
 export declare function encryptionSideData2Info(buffer: Uint8ArrayInterface): EncryptionInfo;
 export declare function encryptionInfo2SideData(info: EncryptionInfo): Uint8Array;

package/dist/esm/util/pcm.d.ts

@@ -1,4 +1,4 @@
-import { AVCodecID } from "../codec.d.ts";
+import { AVCodecID } from "../codec.ts";
 export declare function getPcmCodecId(bps: int32, flt: boolean, be: boolean, flags: int32): AVCodecID.AV_CODEC_ID_NONE | AVCodecID.AV_CODEC_ID_FIRST_AUDIO | AVCodecID.AV_CODEC_ID_PCM_S16BE | AVCodecID.AV_CODEC_ID_PCM_U16LE | AVCodecID.AV_CODEC_ID_PCM_U16BE | AVCodecID.AV_CODEC_ID_PCM_S8 | AVCodecID.AV_CODEC_ID_PCM_U8 | AVCodecID.AV_CODEC_ID_PCM_S32LE | AVCodecID.AV_CODEC_ID_PCM_S32BE | AVCodecID.AV_CODEC_ID_PCM_U32LE | AVCodecID.AV_CODEC_ID_PCM_U32BE | AVCodecID.AV_CODEC_ID_PCM_S24LE | AVCodecID.AV_CODEC_ID_PCM_S24BE | AVCodecID.AV_CODEC_ID_PCM_U24LE | AVCodecID.AV_CODEC_ID_PCM_U24BE | AVCodecID.AV_CODEC_ID_PCM_F32BE | AVCodecID.AV_CODEC_ID_PCM_F32LE | AVCodecID.AV_CODEC_ID_PCM_F64BE | AVCodecID.AV_CODEC_ID_PCM_F64LE | AVCodecID.AV_CODEC_ID_PCM_S64LE | AVCodecID.AV_CODEC_ID_PCM_S64BE;
 export declare function getExactBitsPerSample(codecId: AVCodecID): 0 | 4 | 8 | 16 | 32 | 64 | 24;
 export declare function getBitsPerSample(codecId: AVCodecID): 0 | 2 | 3 | 4 | 8 | 16 | 32 | 64 | 24;

package/dist/esm/util/pixel.d.ts

@@ -1,4 +1,4 @@
-import { AVChromaLocation, AVPixelFormat } from "../pixfmt.d.ts";
+import { AVChromaLocation, AVPixelFormat } from "../pixfmt.ts";
 export declare function chromaLocation2Pos(pos: AVChromaLocation): {
     x: number;
     y: number;

package/dist/esm/util/rational.d.ts

@@ -1,4 +1,4 @@
-import type { AVRational } from "../struct/rational.d.ts";
+import type { AVRational } from "../struct/rational.ts";
 /**
  * 将一个时间戳由一个时间基转换到另一个时间基
  *

package/dist/esm/util/sample.d.ts

@@ -1,4 +1,4 @@
-import { AVSampleFormat } from "../audiosamplefmt.d.ts";
+import { AVSampleFormat } from "../audiosamplefmt.ts";
 export declare function getBytesPerSample(format: AVSampleFormat): number;
 export declare function sampleFormatIsPlanar(format: AVSampleFormat): boolean;
 export declare function sampleFormatGetLinesize(format: AVSampleFormat, channels: int32, nbSamples: int32, align?: int32): number;

package/dist/esm/util/serialize.d.ts

@@ -1,9 +1,9 @@
-import type { AVCodecID, AVMediaType, AVPacketSideDataType } from "../codec.d.ts";
-import type AVPacket from "../struct/avpacket.d.ts";
-import type { AVRational } from "../struct/rational.d.ts";
-import type { AVChromaLocation, AVColorPrimaries, AVColorRange, AVColorSpace, AVColorTransferCharacteristic, AVFieldOrder, AVPixelFormat } from "../pixfmt.d.ts";
-import type { AVChannelOrder, AVSampleFormat } from "../audiosamplefmt.d.ts";
-import AVCodecParameters from "../struct/avcodecparameters.d.ts";
+import type { AVCodecID, AVMediaType, AVPacketSideDataType } from "../codec.ts";
+import type AVPacket from "../struct/avpacket.ts";
+import type { AVRational } from "../struct/rational.ts";
+import type { AVChromaLocation, AVColorPrimaries, AVColorRange, AVColorSpace, AVColorTransferCharacteristic, AVFieldOrder, AVPixelFormat } from "../pixfmt.ts";
+import type { AVChannelOrder, AVSampleFormat } from "../audiosamplefmt.ts";
+import AVCodecParameters from "../struct/avcodecparameters.ts";
 export interface AVPacketSerialize {
     pts: int64;
     dts: int64;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@libmedia/avutil",
-  "version": "1.1.0",
+  "version": "1.3.0",
   "description": "libmedia 工具模块",
   "sideEffects": false,
   "repository": {
@@ -18,8 +18,8 @@
   "author": "Gaoxing Zhao",
   "license": "LGPL-3.0-or-later",
   "dependencies": {
-    "@libmedia/common": "~2.1.0",
-    "@libmedia/cheap": "~1.1.0"
+    "@libmedia/common": "~2.3.0",
+    "@libmedia/cheap": "~1.3.0"
   },
   "type": "module",
   "types": "./dist/esm/index.d.ts",

package/src/codecs/h264.ts

@@ -662,12 +662,22 @@ export function parseAVCodecParameters(
   }
 }
 
-export function isIDR(avpacket: pointer<AVPacket>, naluLengthSize: int32 = 4) {
+/**
+ * 判断是否是随机访问点
+ * 
+ * @param avpacket 
+ * @param naluLengthSize 
+ * @returns 
+ */
+export function isRAP(avpacket: pointer<AVPacket>, naluLengthSize: int32 = 4) {
   if (avpacket.flags & AVPacketFlags.AV_PKT_FLAG_H26X_ANNEXB) {
     let nalus = naluUtil.splitNaluByStartCode(mapUint8Array(avpacket.data, reinterpret_cast<size>(avpacket.size)))
     return nalus.some((nalu) => {
       const type = nalu[0] & 0x1f
       return type === H264NaluType.kSliceIDR
+        // H.264 Recovery Point SEI
+        || type === H264NaluType.kSliceSEI
+          && nalu[1] === 6
     })
   }
   else {
@@ -678,6 +688,12 @@ export function isIDR(avpacket: pointer<AVPacket>, naluLengthSize: int32 = 4) {
       if (type === H264NaluType.kSliceIDR) {
         return true
       }
+      // H.264 Recovery Point SEI
+      if (type === H264NaluType.kSliceSEI
+        && intread.r8(avpacket.data + (i + naluLengthSize) + 1) === 6
+      ) {
+        return true
+      }
       if (naluLengthSize === 4) {
         i += intread.rb32(avpacket.data + i)
       }

package/src/codecs/hevc.ts

@@ -702,12 +702,21 @@ export function parseAVCodecParameters(
   }
 }
 
-export function isIDR(avpacket: pointer<AVPacket>, naluLengthSize: int32 = 4) {
+/**
+ * 判断是否是随机访问点
+ * 
+ * @param avpacket 
+ * @param naluLengthSize 
+ * @returns 
+ */
+export function isRAP(avpacket: pointer<AVPacket>, naluLengthSize: int32 = 4) {
   if (avpacket.flags & AVPacketFlags.AV_PKT_FLAG_H26X_ANNEXB) {
     let nalus = naluUtil.splitNaluByStartCode(mapUint8Array(avpacket.data, reinterpret_cast<size>(avpacket.size)))
     return nalus.some((nalu) => {
       const type = (nalu[0] >>> 1) & 0x3f
-      return type === HEVCNaluType.kSliceIDR_N_LP || type === HEVCNaluType.kSliceIDR_W_RADL
+      return type === HEVCNaluType.kSliceIDR_N_LP
+        || type === HEVCNaluType.kSliceIDR_W_RADL
+        || type === HEVCNaluType.kSliceCRA_NUT
     })
   }
   else {
@@ -715,7 +724,10 @@ export function isIDR(avpacket: pointer<AVPacket>, naluLengthSize: int32 = 4) {
     let i = 0
     while (i < (size - naluLengthSize)) {
       const type = (intread.r8(avpacket.data + (i + naluLengthSize)) >>> 1) & 0x3f
-      if (type === HEVCNaluType.kSliceIDR_N_LP || type === HEVCNaluType.kSliceIDR_W_RADL) {
+      if (type === HEVCNaluType.kSliceIDR_N_LP
+        || type === HEVCNaluType.kSliceIDR_W_RADL
+        || type === HEVCNaluType.kSliceCRA_NUT
+      ) {
         return true
       }
       if (naluLengthSize === 4) {

package/src/codecs/mpeg4.ts

@@ -31,7 +31,13 @@ export const enum Mpeg4PictureType {
   B
 }
 
-export function isIDR(avpacket: pointer<AVPacket>) {
+/**
+ * 判断是否是随机访问点
+ * 
+ * @param avpacket 
+ * @returns 
+ */
+export function isRAP(avpacket: pointer<AVPacket>) {
   const byte = accessof(reinterpret_cast<pointer<uint8>>(avpacket.data + 4))
   return (byte >>> 6) === Mpeg4PictureType.I
 }

package/src/codecs/mpegvideo.ts

@@ -32,7 +32,13 @@ export const enum MpegVideoPictureType {
   B
 }
 
-export function isIDR(avpacket: pointer<AVPacket>) {
+/**
+ * 判断是否是随机访问点
+ * 
+ * @param avpacket 
+ * @returns 
+ */
+export function isRAP(avpacket: pointer<AVPacket>) {
   const data = getAVPacketData(avpacket)
 
   for (let i = 0; i < data.length - 6; i++) {

package/src/codecs/vp8.ts

@@ -85,7 +85,13 @@ export function parseExtraData(extradata: Uint8ArrayInterface) {
   }
 }
 
-export function isIDR(avpacket: pointer<AVPacket>) {
+/**
+ * 判断是否是随机访问点
+ * 
+ * @param avpacket 
+ * @returns 
+ */
+export function isRAP(avpacket: pointer<AVPacket>) {
   const first = accessof(avpacket.data)
   return !(first >>> 7)
 }

package/src/codecs/vp9.ts

@@ -196,7 +196,13 @@ export function generateExtradata(codecpar: pointer<AVCodecParameters>) {
   return ioWriter.getWroteBuffer()
 }
 
-export function isIDR(avpacket: pointer<AVPacket>) {
+/**
+ * 判断是否是随机访问点
+ * 
+ * @param avpacket 
+ * @returns 
+ */
+export function isRAP(avpacket: pointer<AVPacket>) {
   const first = accessof(avpacket.data)
 
   const version = (first >>> 5) & 0x01

package/src/codecs/vvc.ts

@@ -807,12 +807,21 @@ export function parseAVCodecParameters(
   }
 }
 
-export function isIDR(avpacket: pointer<AVPacket>, naluLengthSize: int32 = 4) {
+/**
+ * 判断是否是随机访问点
+ * 
+ * @param avpacket 
+ * @param naluLengthSize 
+ * @returns 
+ */
+export function isRAP(avpacket: pointer<AVPacket>, naluLengthSize: int32 = 4) {
   if (avpacket.flags & AVPacketFlags.AV_PKT_FLAG_H26X_ANNEXB) {
     let nalus = naluUtil.splitNaluByStartCode(mapUint8Array(avpacket.data, reinterpret_cast<size>(avpacket.size)))
     return nalus.some((nalu) => {
       const type = (nalu[1] >>> 3) & 0x1f
-      return type === VVCNaluType.kIDR_N_LP || type === VVCNaluType.kIDR_W_RADL
+      return type === VVCNaluType.kIDR_N_LP
+        || type === VVCNaluType.kIDR_W_RADL
+        || type === VVCNaluType.kCRA_NUT
     })
   }
   else {
@@ -820,7 +829,10 @@ export function isIDR(avpacket: pointer<AVPacket>, naluLengthSize: int32 = 4) {
     let i = 0
     while (i < (size - naluLengthSize)) {
       const type = (intread.r8(avpacket.data + (i + naluLengthSize + 1)) >>> 3) & 0x1f
-      if (type === VVCNaluType.kIDR_N_LP || type === VVCNaluType.kIDR_W_RADL) {
+      if (type === VVCNaluType.kIDR_N_LP
+        || type === VVCNaluType.kIDR_W_RADL
+        || type === VVCNaluType.kCRA_NUT
+      ) {
         return true
       }
       if (naluLengthSize === 4) {

package/src/function/audioData2AVFrame.ts

@@ -53,9 +53,9 @@ function mapFormat(format: AudioSampleFormat) {
   }
 }
 
-export function audioData2AVFrame(audioData: AudioData, avframe: pointer<AVFrame> = nullptr) {
+export function audioData2AVFrame<T extends pointer<AVFrame> = pointer<AVFrame>>(audioData: AudioData, avframe: T = nullptr) {
   if (avframe === nullptr) {
-    avframe = createAVFrame()
+    avframe = createAVFrame() as T
   }
 
   avframe.sampleRate = audioData.sampleRate
@@ -78,5 +78,5 @@ export function audioData2AVFrame(audioData: AudioData, avframe: pointer<AVFrame
     })
   }
 
-  return avframe
+  return avframe as T
 }

package/src/function/avframe2VideoFrame.ts

@@ -25,9 +25,9 @@
 
 import type AVFrame from '../struct/avframe'
 import { getAVPixelFormatDescriptor } from '../pixelFormatDescriptor'
-import { AVColorRange, type AVPixelFormat } from '../pixfmt'
+import { AVColorRange, AVPixelFormat } from '../pixfmt'
 import { avRescaleQ2 } from '../util/rational'
-import { AV_TIME_BASE_Q } from '../constant'
+import { AV_TIME_BASE_Q, NOPTS_VALUE_BIGINT } from '../constant'
 import { getHeap } from '@libmedia/cheap/internal'
 import { object } from '@libmedia/common'
 import { pixelFormatMap, colorPrimariesMap, colorSpaceMap, colorTrcMap } from './constant/webcodecs'
@@ -38,6 +38,9 @@ const colorSpaceMapReverse = object.reverse(colorSpaceMap)
 const colorTrcMapReverse = object.reverse(colorTrcMap)
 
 export function avPixelFormat2Format(pixfmt: AVPixelFormat) {
+  if (pixfmt === AVPixelFormat.AV_PIX_FMT_YUVJ420P) {
+    return 'I420'
+  }
   return pixelFormatMapReverse[pixfmt] ?? null
 }
 
@@ -74,7 +77,7 @@ export function avframe2VideoFrame(avframe: pointer<AVFrame>, pts?: int64, video
     codedHeight: height,
     timestamp: pts ? static_cast<double>(pts) : static_cast<double>(avRescaleQ2(avframe.pts, addressof(avframe.timeBase), AV_TIME_BASE_Q)),
     format: avPixelFormat2Format(avframe.format),
-    duration: static_cast<double>(avRescaleQ2(avframe.duration, addressof(avframe.timeBase), AV_TIME_BASE_Q)),
+    duration: avframe.duration !== NOPTS_VALUE_BIGINT ? static_cast<double>(avRescaleQ2(avframe.duration, addressof(avframe.timeBase), AV_TIME_BASE_Q)) : null,
     layout,
     colorSpace: getVideoColorSpaceInit(avframe),
     visibleRect: {

package/src/function/videoFrame2AVFrame.ts

@@ -46,9 +46,9 @@ export function mapColorTrc(colorTrc: VideoTransferCharacteristics) {
   return colorTrcMap[colorTrc] ?? AVColorTransferCharacteristic.AVCOL_TRC_BT709
 }
 
-export async function videoFrame2AVFrame(videoFrame: VideoFrame, avframe: pointer<AVFrame> = nullptr) {
+export async function videoFrame2AVFrame<T extends pointer<AVFrame> = pointer<AVFrame>>(videoFrame: VideoFrame, avframe: T = nullptr) {
   if (avframe === nullptr) {
-    avframe = createAVFrame()
+    avframe = createAVFrame() as T
   }
   else {
     unrefAVFrame(avframe)
@@ -91,5 +91,5 @@ export async function videoFrame2AVFrame(videoFrame: VideoFrame, avframe: pointe
     layout
   })
 
-  return avframe
+  return avframe as T
 }