@libmedia/avutil 1.2.0 → 1.3.0

package/dist/esm/function/videoFrame2AVFrame.js

@@ -1,7 +1,3 @@
-import { CTypeEnumRead as cheap__CTypeEnumRead__0 } from "@libmedia/cheap/internal";
-
-import { CTypeEnumWrite as cheap__CTypeEnumWrite__1 } from "@libmedia/cheap/internal";
-
 import { createAVFrame, getVideoBuffer, unrefAVFrame } from "../util/avframe.js";
 
 import { getAVPixelFormatDescriptor } from "../pixelFormatDescriptor.js";
@@ -29,24 +25,19 @@ export function mapColorTrc(colorTrc) {
 }
 
 export async function videoFrame2AVFrame(videoFrame, avframe = 0) {
-    0 === avframe ? avframe = createAVFrame() : unrefAVFrame(avframe), cheap__CTypeEnumWrite__1[15](avframe + 80, mapPixelFormat(videoFrame.format)), 
-    cheap__CTypeEnumWrite__1[17](avframe + 104, BigInt(Math.floor(videoFrame.timestamp))), 
-    cheap__CTypeEnumWrite__1[17](avframe + 232, cheap__CTypeEnumRead__0[17](avframe + 104)), 
-    cheap__CTypeEnumWrite__1[15](avframe + 68, videoFrame.codedWidth), cheap__CTypeEnumWrite__1[15](avframe + 72, videoFrame.codedHeight), 
-    cheap__CTypeEnumWrite__1[17](avframe + 312, BigInt(Math.floor(videoFrame.duration))), 
-    cheap__CTypeEnumWrite__1[15](avframe + 124, AV_TIME_BASE), cheap__CTypeEnumWrite__1[15](avframe + 120, 1), 
-    cheap__CTypeEnumWrite__1[15](avframe + 220, mapColorSpace(videoFrame.colorSpace.matrix)), 
-    cheap__CTypeEnumWrite__1[15](avframe + 212, mapColorPrimaries(videoFrame.colorSpace.primaries)), 
-    cheap__CTypeEnumWrite__1[15](avframe + 216, mapColorTrc(videoFrame.colorSpace.transfer)), 
-    cheap__CTypeEnumWrite__1[15](avframe + 208, videoFrame.colorSpace.fullRange ? 2 : 1), 
-    videoFrame.visibleRect && (cheap__CTypeEnumWrite__1[25](avframe + 276, videoFrame.visibleRect.left), 
-    cheap__CTypeEnumWrite__1[25](avframe + 280, videoFrame.codedWidth - videoFrame.visibleRect.right), 
-    cheap__CTypeEnumWrite__1[25](avframe + 268, videoFrame.visibleRect.top), cheap__CTypeEnumWrite__1[25](avframe + 272, videoFrame.codedHeight - videoFrame.visibleRect.bottom)), 
-    getVideoBuffer(avframe);
-    const des = getAVPixelFormatDescriptor(cheap__CTypeEnumRead__0[15](avframe + 80)), layout = [];
+    0 === avframe ? avframe = createAVFrame() : unrefAVFrame(avframe), avframe.format = mapPixelFormat(videoFrame.format), 
+    avframe.pts = BigInt(Math.floor(videoFrame.timestamp)), avframe.bestEffortTimestamp = avframe.pts, 
+    avframe.width = videoFrame.codedWidth, avframe.height = videoFrame.codedHeight, 
+    avframe.duration = BigInt(Math.floor(videoFrame.duration)), avframe.timeBase.den = AV_TIME_BASE, 
+    avframe.timeBase.num = 1, avframe.colorSpace = mapColorSpace(videoFrame.colorSpace.matrix), 
+    avframe.colorPrimaries = mapColorPrimaries(videoFrame.colorSpace.primaries), avframe.colorTrc = mapColorTrc(videoFrame.colorSpace.transfer), 
+    avframe.colorRange = videoFrame.colorSpace.fullRange ? 2 : 1, videoFrame.visibleRect && (avframe.cropLeft = videoFrame.visibleRect.left, 
+    avframe.cropRight = videoFrame.codedWidth - videoFrame.visibleRect.right, avframe.cropTop = videoFrame.visibleRect.top, 
+    avframe.cropBottom = videoFrame.codedHeight - videoFrame.visibleRect.bottom), getVideoBuffer(avframe);
+    const des = getAVPixelFormatDescriptor(avframe.format), layout = [];
     for (let i = 0; i < des.comp.length; i++) des.comp[i].plane >= i && layout.push({
-        offset: cheap__CTypeEnumRead__0[20](avframe + 4 * i),
-        stride: cheap__CTypeEnumRead__0[15](avframe + 32 + 4 * i)
+        offset: avframe.data[i],
+        stride: avframe.linesize[i]
     });
     return await videoFrame.copyTo(getHeap(), {
         layout: layout

package/dist/esm/function/videoFrame2AVFrame.js.map

@@ -1 +1 @@
-{"version":3,"names":["createAVFrame","getVideoBuffer","unrefAVFrame","getAVPixelFormatDescriptor","getHeap","AV_TIME_BASE","pixelFormatMap","colorPrimariesMap","colorSpaceMap","colorTrcMap","mapPixelFormat","format","mapColorSpace","colorSpace","mapColorPrimaries","colorPrimaries","mapColorTrc","colorTrc","async","videoFrame2AVFrame","videoFrame","avframe","cheap__CTypeEnumWrite__1","BigInt","Math","floor","timestamp","cheap__CTypeEnumRead__0","codedWidth","codedHeight","duration","matrix","primaries","transfer","fullRange","visibleRect","left","right","top","bottom","des","layout","i","comp","length","plane","push","offset","stride","copyTo"],"sources":["../../../src/function/videoFrame2AVFrame.ts"],"mappings":";;;;SAwBSA,eAAeC,gBAAgBC,oBAAc;;SAG7CC,kCAA4B;;SAC5BC,eAAS;;SACTC,oBAAc;;SACdC,gBAAgBC,mBAAmBC,eAAeC,mBAAa;;OAElE,SAAUC,eAAeC;IAC7B,OAAOL,eAAeK,YAAO;AAC/B;;OAEM,SAAUC,cAAcC;IAC5B,OAAOL,cAAcK,eAAW;AAClC;;OAEM,SAAUC,kBAAkBC;IAChC,OAAOR,kBAAkBQ,mBAAe;AAC1C;;OAEM,SAAUC,YAAYC;IAC1B,OAAOR,YAAYQ,aAAS;AAC9B;;OAEOC,eAAeC,mBAAmBC,YAAwBC,UAAA;IACpD,MAAPA,UACFA,UAAUrB,kBAGVE,aAAamB,UAGfC,yBAAA,IAAAD,UAAO,IAAUX,eAAeU,WAAWT;IAC3CW,yBAAA,IAAAD,UAAO,KAAAE,OAAAC,KAAAC,MAA0BL,WAAWM;IAC5CJ,yBAAA,IAAAD,UAAO,KAAAM,wBAAA,IAAuBN,UAAO;IACrCC,yBAAA,IAAAD,UAAO,IAASD,WAAWQ,aAC3BN,yBAAA,IAAAD,UAAO,IAAUD,WAAWS;IAC5BP,yBAAA,IAAAD,UAAO,KAAAE,OAAAC,KAAAC,MAA+BL,WAAWU;IACjDR,yBAAA,IAAAD,UAAO,KAAgBhB,eACvBiB,yBAAA,IAAAD,UAAO,KAAgB;IAEvBC,yBAAA,IAAAD,UAAO,KAAcT,cAAcQ,WAAWP,WAAWkB;IACzDT,yBAAA,IAAAD,UAAO,KAAkBP,kBAAkBM,WAAWP,WAAWmB;IACjEV,yBAAA,IAAAD,UAAO,KAAYL,YAAYI,WAAWP,WAAWoB;IACrDX,yBAAA,IAAAD,UAAO,KAAcD,WAAWP,WAAWqB,YAAW,IAAgC;IAElFd,WAAWe,gBACbb,yBAAA,IAAAD,UAAO,KAAmCD,WAAWe,YAAYC;IACjEd,yBAAA,IAAAD,UAAO,KAAoCD,WAAWQ,aAAaR,WAAWe,YAAYE;IAC1Ff,yBAAA,IAAAD,UAAO,KAAkCD,WAAWe,YAAYG,MAChEhB,yBAAA,IAAAD,UAAO,KAAqCD,WAAWS,cAAcT,WAAWe,YAAYI;IAG9FtC,eAAeoB;IAEf,MAAMmB,MAAMrC,2BAA2BwB,wBAAA,IAAAN,UAAO,MACxCoB,SAAwB;IAC9B,KAAK,IAAIC,IAAI,GAAGA,IAAIF,IAAIG,KAAKC,QAAQF,KAC/BF,IAAIG,KAAKD,GAAGG,SAASH,KACvBD,OAAOK,KAAK;QACVC,QAAMpB,wBAAA,IAA6CN,UAAO;QAC1D2B,QAAMrB,wBAAA,IAAEN,UAAO;;IAQrB,aAJMD,WAAW6B,OAAO7C,WAAW;QACjCqC;QAGKpB;AACT","ignoreList":[]}
+{"version":3,"names":["createAVFrame","getVideoBuffer","unrefAVFrame","getAVPixelFormatDescriptor","getHeap","AV_TIME_BASE","pixelFormatMap","colorPrimariesMap","colorSpaceMap","colorTrcMap","mapPixelFormat","format","mapColorSpace","colorSpace","mapColorPrimaries","colorPrimaries","mapColorTrc","colorTrc","async","videoFrame2AVFrame","videoFrame","avframe","pts","BigInt","Math","floor","timestamp","bestEffortTimestamp","width","codedWidth","height","codedHeight","duration","timeBase","den","num","matrix","primaries","transfer","colorRange","fullRange","visibleRect","cropLeft","left","cropRight","right","cropTop","top","cropBottom","bottom","des","layout","i","comp","length","plane","push","offset","data","stride","linesize","copyTo"],"sources":["../../../src/function/videoFrame2AVFrame.ts"],"mappings":"SAwBSA,eAAeC,gBAAgBC,oBAAc;;SAG7CC,kCAA4B;;SAC5BC,eAAS;;SACTC,oBAAc;;SACdC,gBAAgBC,mBAAmBC,eAAeC,mBAAa;;OAElE,SAAUC,eAAeC;IAC7B,OAAOL,eAAeK,YAAO;AAC/B;;OAEM,SAAUC,cAAcC;IAC5B,OAAOL,cAAcK,eAAW;AAClC;;OAEM,SAAUC,kBAAkBC;IAChC,OAAOR,kBAAkBQ,mBAAe;AAC1C;;OAEM,SAAUC,YAAYC;IAC1B,OAAOR,YAAYQ,aAAS;AAC9B;;OAEOC,eAAeC,mBAAkEC,YAAwBC,UAAA;IACnG,MAAPA,UACFA,UAAUrB,kBAGVE,aAAamB,UAGfA,QAAQV,SAASD,eAAeU,WAAWT;IAC3CU,QAAQC,MAAGC,OAAAC,KAAAC,MAAsBL,WAAWM,aAC5CL,QAAQM,sBAAsBN,QAAQC;IACtCD,QAAQO,QAAQR,WAAWS,YAC3BR,QAAQS,SAASV,WAAWW;IAC5BV,QAAQW,WAAQT,OAAAC,KAAAC,MAAsBL,WAAWY,YACjDX,QAAQY,SAASC,MAAM7B;IACvBgB,QAAQY,SAASE,MAAM,GAEvBd,QAAQR,aAAaD,cAAcQ,WAAWP,WAAWuB;IACzDf,QAAQN,iBAAiBD,kBAAkBM,WAAWP,WAAWwB,YACjEhB,QAAQJ,WAAWD,YAAYI,WAAWP,WAAWyB;IACrDjB,QAAQkB,aAAanB,WAAWP,WAAW2B,YAAW,IAAgC,GAElFpB,WAAWqB,gBACbpB,QAAQqB,WAAkCtB,WAAWqB,YAAYE;IACjEtB,QAAQuB,YAAmCxB,WAAWS,aAAaT,WAAWqB,YAAYI,OAC1FxB,QAAQyB,UAAiC1B,WAAWqB,YAAYM;IAChE1B,QAAQ2B,aAAoC5B,WAAWW,cAAcX,WAAWqB,YAAYQ,SAG9FhD,eAAeoB;IAEf,MAAM6B,MAAM/C,2BAA2BkB,QAAQV,SACzCwC,SAAwB;IAC9B,KAAK,IAAIC,IAAI,GAAGA,IAAIF,IAAIG,KAAKC,QAAQF,KAC/BF,IAAIG,KAAKD,GAAGG,SAASH,KACvBD,OAAOK,KAAK;QACVC,QAAmDpC,QAAQqC,KAAKN;QAChEO,QAAQtC,QAAQuC,SAASR;;IAQ/B,aAJMhC,WAAWyC,OAAOzD,WAAW;QACjC+C;QAGK9B;AACT","ignoreList":[]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@libmedia/avutil",
-  "version": "1.2.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.2.0",
-    "@libmedia/cheap": "~1.2.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
 }