1.0.0.3

Moved _MFP_ConvertString functions from internal to external usage: MFPConvertString
Added MFPMediaItem_StreamTable function
Added media type equates for StreamTable

Author: mrfearless

MFPlayer-x64/MFPlayer.asm

@@ -99,11 +99,17 @@ MFPMediaItem_GetMetadata          PROTO pMediaItem:QWORD, ppMetadataStore:QWORD
 
 MFPMediaItem_SetStreamSink        PROTO pMediaItem:QWORD, dwStreamIndex:DWORD, pMediaSink:QWORD
 
-; Misc
+; Media Information
+MFPMediaItem_StreamTable          PROTO pMediaItem:QWORD, lpdwStreamCount:QWORD, lpqwStreamTable:QWORD
+
 ; Misc
 MFPConvertMSTimeToTimeStringA     PROTO dwMilliseconds:DWORD, lpszTime:QWORD, dwTimeFormat:DWORD
 MFPConvertMSTimeToTimeStringW     PROTO dwMilliseconds:DWORD, lpszTime:QWORD, dwTimeFormat:DWORD
 
+MFPConvertStringToAnsi            PROTO lpszWideString:QWORD
+MFPConvertStringToWide            PROTO lpszAnsiString:QWORD
+MFPConvertStringFree              PROTO lpString:QWORD
+
 IFDEF __UNICODE__
     MFPMediaPlayer_CreateMediaItem  EQU <MFPMediaPlayer_CreateMediaItemW>
     MFPMediaItem_GetURL             EQU <MFPMediaItem_GetURLW>
@@ -139,6 +145,35 @@ IFNDEF HRESULT
 HRESULT TYPEDEF DWORD
 ENDIF
 
+STREAMLANG_LENGTH    EQU 28
+STREAMNAME_LENGTH    EQU 28
+
+IFNDEF MFP_STREAM_RECORD
+MFP_STREAM_RECORD   STRUCT 8
+    dwStreamID      DD ?
+    bSelected       DD ? ; bool
+    szStreamLang    DB (STREAMLANG_LENGTH+4) DUP (?)
+    szStreamName    DB (STREAMNAME_LENGTH+4) DUP (?)
+    dwMajorType     DD ? ; Video, Audio, etc
+    dwSubType       DD ? ; Video or Audio subtype
+    dwBitRate       DD ? ; kilobits per second: kbps
+    UNION
+        STRUCT
+        dwChannels      DD ? ; 6 = 5.1 etc
+        dwSpeakers      DD ? ; positioning of speakers
+        dwBitsPerSample DD ? ; bitdepth for lossless
+        dwSamplesPerSec DD ? ; kHz
+        ENDS
+        STRUCT
+        dwFrameRate     DD ? ; fps
+        dwFrameWidth    DD ? ; px
+        dwFrameHeight   DD ? ; px
+        dwInterlace     DD ? ; mode
+        ENDS
+    ENDS
+MFP_STREAM_RECORD   ENDS
+ENDIF
+
 IFNDEF MFP_EVENT_HEADER
 MFP_EVENT_HEADER    STRUCT
     eEventType      MFP_EVENT_TYPE ?
@@ -423,6 +458,118 @@ MFVideoARMode_NonLinearStretch  EQU 4h
 MFVideoARMode_Mask              EQU 7h
 
 
+; MFVideoInterlaceMode
+MFVideoInterlace_Unknown        EQU 0
+MFVideoInterlace_Progressive    EQU 2
+MFVideoInterlace_FieldInterleavedUpperFirst EQU 3
+MFVideoInterlace_FieldInterleavedLowerFirst EQU 4
+MFVideoInterlace_FieldSingleUpper EQU 5
+MFVideoInterlace_FieldSingleLower EQU 6
+MFVideoInterlace_MixedInterlaceOrProgressive EQU 7
+
+;---------------------------------------------------------------------------------------------------------------------------
+; Media Major Type         | Description                              | Subtype
+;--------------------------------------------------------------------------------------------------------------------------- 
+MFMT_None           EQU  0 ; None.                                      None.
+MFMT_Audio 	        EQU  1 ; Audio. 	                                Audio Subtype GUIDs.
+MFMT_Video 	        EQU  2 ; Video. 	                                Video Subtype GUIDs.  
+MFMT_Stream 	    EQU  3 ; Multiplexed stream or elementary stream. 	Stream Subtype GUIDs
+MFMT_Metadata 	    EQU  4 ; Metadata stream. 	                        None.
+MFMT_Protected 	    EQU  5 ; Protected media. 	                        The subtype specifies the content protection scheme.
+MFMT_SAMI 	        EQU  6 ; SAMI captions. 	                        None.
+MFMT_Image 	        EQU  7 ; Still image stream. 	                    WIC GUIDs and CLSIDs.
+MFMT_Binary 	    EQU  8 ; Binary stream. 	                        None.
+MFMT_HTML 	        EQU  9 ; HTML stream. 	                            None.
+MFMT_Perception 	EQU 10 ; Streams from a camera sensor               None.
+MFMT_FileTransfer 	EQU 11 ; A stream that contains data files. 	    None.
+MFMT_Script 	    EQU 12 ; Script stream. 	                        None.
+
+;---------------------------------------------------------------------------------------------------------------------------
+; Audio Format Subtype     | Description                              
+;--------------------------------------------------------------------------------------------------------------------------- 
+MFAF_Unknown         EQU  0 ; Unknown
+MFAF_MP3 	         EQU  1 ; MPEG Audio Layer-3 (MP3). MPEG-4 Part 3, AAC (ISO/IEC 14496-3)
+MFAF_AAC 	         EQU  2 ; Advanced Audio Coding (AAC).
+MFAF_ALAC 	         EQU  3 ; Apple Lossless Audio Codec (ALAC).
+MFAF_Dolby_AC3 	     EQU  4 ; Dolby Digital (AC-3).
+MFAF_Dolby_AC3_SP    EQU  5 ; Dolby AC-3 audio over Sony/Philips Digital Interface (S/PDIF).
+MFAF_Dolby_DDPlus 	 EQU  6 ; Dolby Digital Plus. EAC3
+MFAF_Dolby_AC4       EQU  7 ; Dolby (AC-4).
+MFAF_Dolby_AC4_V1    EQU  8
+MFAF_Dolby_AC4_V2    EQU  9
+MFAF_Dolby_AC4_V1_ES EQU 10
+MFAF_Dolby_AC4_V2_ES EQU 11
+MFAF_DTS 	         EQU 12 ; Digital Theater Systems (DTS) audio.
+MFAF_DTS_RAW         EQU 13
+MFAF_DTS_HD          EQU 14 ; DTS-HD Master Audio
+MFAF_DTS_XLL         EQU 15 ; DTS-HD Master Audio Lossless
+MFAF_DTS_LBR         EQU 16
+MFAF_DTS_UHD         EQU 17
+MFAF_DTS_UHDY        EQU 18
+MFAF_WMAudio_LL      EQU 19 ; Windows Media Audio 9 Lossless codec or Windows Media Audio 9.1 codec. (WMALOSSLESS)
+MFAF_WMAudioV8 	     EQU 20 ; Windows Media Audio 8 codec, Windows Media Audio 9 codec, or Windows Media Audio 9.1 codec. (WMAV2)
+MFAF_WMAudioV9 	     EQU 21 ; Windows Media Audio 9 Professional codec or Windows Media Audio 9.1 Professional codec. (WMAPRO)
+MFAF_WMASPDIF 	     EQU 22 ; Windows Media Audio 9 Professional codec over S/PDIF.
+MFAF_FLAC 	         EQU 23 ; Free Lossless Audio Codec (FLAC).
+MFAF_PCM 	         EQU 24 ; Uncompressed PCM audio.
+MFAF_LPCM            EQU 25 ; DVD audio data
+MFAF_MPEG 	         EQU 26 ; MPEG-1 audio payload. (MP1)
+MFAF_MPEGH           EQU 27
+MFAF_MPEGH_ES        EQU 28
+MFAF_MSP1 	         EQU 29 ; Windows Media Audio 9 Voice codec (WMAVOICE)
+MFAF_AMR_NB 	     EQU 30 ; Adaptive Multi-Rate Narrowband (AMR_NB)
+MFAF_AMR_WB 	     EQU 31 ; Adaptive Multi-Rate Wideband (AMR_WB)
+MFAF_AMR_WP 	     EQU 32 ; Adaptive Multi-Rate Wideband Plus (AMR_WP)
+MFAF_DRM 	         EQU 33 ; Encrypted audio data used with secure audio path.
+MFAF_Vorbis          EQU 34 ; VORBIS
+MFAF_Opus 	         EQU 35 ; Opus
+MFAF_Float 	         EQU 36 ; Uncompressed IEEE floating-point audio.
+MFAF_Float_SO        EQU 37 ; Uncompressed IEEE floating-point audio.
+MFAF_RAW_AAC1 	     EQU 38 ; Advanced Audio Coding (AAC). In AVI
+MFAF_QCELP 	         EQU 39 ; QCELP (Qualcomm Code Excited Linear Prediction) audio.
+MFAF_Dolby_AC3_HDCP  EQU 40 ; Dolby Digital (AC-3) (HDCP)
+MFAF_AAC_HDCP        EQU 41 
+MFAF_PCM_HDCP        EQU 42 
+MFAF_ADTS_HDCP       EQU 43 ; Advanced Audio Coding (AAC) in Audio Data Transport Stream (ADTS) format (HDCP)
+MFAF_ADTS 	         EQU 44 ; Advanced Audio Coding (AAC) in Audio Data Transport Stream (ADTS)
+
+
+;---------------------------------------------------------------------------------------------------------------------------
+; Video Format Subtype     | Description                              
+;--------------------------------------------------------------------------------------------------------------------------- 
+MFVF_Unknown        EQU  0 ; 
+MFVF_M4S2 	        EQU  1 ; 'M4S2' 	MPEG-4 part 2 video.
+MFVF_MP4V 	        EQU  2 ; 'MP4V' 	MPEG-4 part 2 video.
+MFVF_H264 	        EQU  3 ; 'H264' 	H.264 video.
+MFVF_H265 	        EQU  4 ; 'H265' 	H.265 video.
+MFVF_H264_ES        EQU  5 ; 	    Not applicable 	H.264 elementary stream.
+MFVF_WMV1 	        EQU  6 ; 'WMV1' 	Windows Media Video codec version 7.
+MFVF_WMV2 	        EQU  7 ; 'WMV2' 	Windows Media Video 8 codec.
+MFVF_WMV3 	        EQU  8 ; 'WMV3' 	Windows Media Video 9 codec.
+MFVF_MP4S 	        EQU  9 ; 'MP4S' 	ISO MPEG 4 codec version 1.
+MFVF_AV1 	        EQU 10 ; 'AV01' 	AV1 video.
+MFVF_VP80 	        EQU 11 ; 'MPG1' 	VP8 video.
+MFVF_VP90 	        EQU 12 ; 'MPG1' 	VP9 video.
+MFVF_HEVC 	        EQU 13 ; 'HEVC' 	The HEVC Main profile and Main Still Picture profile.
+MFVF_HEVC_ES        EQU 14 ;'HEVS' 	This media type is the same as MFVF_HEVC, except media samples contain a fragmented HEVC bitstream.
+MFVF_H263 	        EQU 15 ; 'H263' 	H.263 video.
+MFVF_MSS1 	        EQU 16 ; 'MSS1' 	Windows Media Screen codec version 1.
+MFVF_MSS2 	        EQU 17 ; 'MSS2' 	Windows Media Video 9 Screen codec.
+MFVF_MJPG 	        EQU 18 ; 'MJPG' 	Motion JPEG.
+MFVF_MPG1 	        EQU 19 ; 'MPG1' 	MPEG-1 video.
+MFVF_MPEG2          EQU 20 ; 	        Not applicable 	MPEG-2 video. (Equivalent to MEDIASUBTYPE_MPEG2_VIDEO in DirectShow.)
+MFVF_DV25 	        EQU 21 ; 'dv25' 	DVCPRO 25 (525-60 or 625-50).
+MFVF_DV50 	        EQU 22 ; 'dv50' 	DVCPRO 50 (525-60 or 625-50).
+MFVF_DVC 	        EQU 23 ; 'dvc ' 	DVC/DV Video.
+MFVF_DVH1 	        EQU 24 ; 'dvh1' 	DVCPRO 100 (1080/60i, 1080/50i, or 720/60P).
+MFVF_DVHD 	        EQU 25 ; 'dvhd' 	HD-DVCR (1125-60 or 1250-50).
+MFVF_DVSD 	        EQU 26 ; 'dvsd' 	SDL-DVCR (525-60 or 625-50).
+MFVF_DVSL 	        EQU 27 ; 'dvsl' 	SD-DVCR (525-60 or 625-50).
+MFVF_WVC1 	        EQU 28 ; 'WVC1' 	SMPTE 421M ("VC-1").
+MFVF_420O 	        EQU 29 ; '420O' 	8-bit per channel planar YUV 4:2:0 video.
+MFVF_MP43 	        EQU 30 ; 'MP43' 	Microsoft MPEG 4 codec version 3. This codec is no longer supported.
+
+
 
 
 

MFPlayer-x64/MFPlayer.inc

@@ -61,26 +61,26 @@ Group=Assembly,Misc
 6=2
 7=2
 [AutoLoad]
-AutoLoad=2,1,6
+AutoLoad=2,1,6,3
 [Size]
 5=
 4=
-3=0,0,0,0,1519
-1=0,0,0,0,59663
+3=0,0,0,0,2336
+1=0,0,0,0,894
 7=0,0,0,0,0
-6=0,0,0,0,1643
-2=0,0,0,0,5929
+6=0,0,0,0,3992
+2=0,0,0,0,22566
 [Find]
-1="dwUserData"
-2="pdwUserData"
-3="dwUserData:DWORD"
-4="qw"
-5="bVideo"
-6="bVideo:QWORD"
-7="mov rax, dwState"
-8="dwState:QWORD"
-9="qwState"
-10="_MFP_utoa_ex"
+1="MFI_GetVideoSubType"
+2="MFI_GetAudioSubType"
+3="MFI_GetMajorType"
+4=".IF eax == 16"
+5="RtlCompareMemory"
+6="MP_STREAM_RECORD"
+7="DEBUG32"
+8="_MFP_ConvertStringToWide"
+9="_MFP_ConvertStringFree"
+10="_MFP_ConvertStringToAnsi"
 [RADebugBP]
 2=
 1=
@@ -94,7 +94,7 @@ MilestoneOnTime=2
 MilestoneOnDate=0
 MilestoneOnDateWhen=1
 MilestoneOnDateStatus=0
-MilestoneOnDateDate=1
+MilestoneOnDateDate=11
 MilestoneOnDateTimeYear=2024
 MilestoneOnDateTimeMonth=8
 MilestoneOnDateTimeDate=25
@@ -118,9 +118,9 @@ ProductVer2Range=0
 ProductVer3Range=0
 ProductVer4Range=0
 [PTimer]
-PTimer=31754439
+PTimer=38287470
 [Collapse]
-1=65552,306783232,153391689,1227133512,613566756,1149838482,273219588,143804424,75514400,2
+1=142879024,131072,,,268585252,306713161,122713345,613566756,297234,1074274450,1109397796,133376,
 3=
 7=
 6=

MFPlayer-x64/MFPlayer.lib

@@ -72,6 +72,12 @@ MFPConvertMSTimeToTimeString,dwMilliseconds,lpszTime,dwTimeFormat
 MFPConvertMSTimeToTimeStringA,dwMilliseconds,lpszTime,dwTimeFormat
 MFPConvertMSTimeToTimeStringW,dwMilliseconds,lpszTime,dwTimeFormat
 
+MFPConvertStringToAnsi,lpszWideString
+MFPConvertStringToWide,lpszAnsiString
+MFPConvertStringFree,lpString
+
+MFPMediaItem_StreamTable,pMediaItem,lpdwStreamCount,lpqwStreamTable
+
 IUnknown_QueryInterface,pThis,riid,ppvObject
 IUnknown_AddRef,pThis
 IUnknown_Release,pThis

MFPlayer-x64/MFPlayer.rap

@@ -26,3 +26,4 @@ IMFPMPCallback,QueryInterface,AddRef,Release,OnMediaPlayerEvent
 IMFPMediaPlayerVtbl,QueryInterface,AddRef,Release,Play,Pause_,Stop,FrameStep,SetPosition,GetPosition,GetDuration,SetRate,GetRate,GetSupportedRates,GetState,CreateMediaItemFromURL,CreateMediaItemFromObject,SetMediaItem,ClearMediaItem,GetMediaItem,GetVolume,SetVolume,GetBalance,SetBalance,GetMute,SetMute,GetNativeVideoSize,GetIdealVideoSize,SetVideoSourceRect,GetVideoSourceRect,SetAspectRatioMode,GetAspectRatioMode,GetVideoWindow,UpdateVideo,SetBorderColor,GetBorderColor,InsertEffect,RemoveEffect,RemoveAllEffects,Shutdown
 IMFPMediaItemVtbl,QueryInterface,AddRef,Release,GetMediaPlayer,GetURL,GetObject,GetUserData,SetUserData,GetStartStopPosition,SetStartStopPosition,HasVideo,HasAudio,IsProtected,GetDuration,GetNumberOfStreams,GetStreamSelection,SetStreamSelection,GetStreamAttribute,GetPresentationAttribute,GetCharacteristics,SetStreamSink,GetMetadata
 
+MFP_STREAM_RECORD,dwStreamID,bSelected,szStreamLang,szStreamName,dwMajorType,dwSubType,dwBitRate,dwChannels,dwSpeakers,dwBitsPerSample,dwSamplesPerSec,dwFrameRate,dwFrameWidth,dwFrameHeight,dwInterlace